Update app.py

app.py

@@ -56,6 +56,8 @@ def load_data():
                     p['price'] = 0
                 if 'photo' not in p:
                     p['photo'] = ''
+                if 'box_qty' not in p:
+                    p['box_qty'] = 1
                 if 'stocks' not in p:
                     p['stocks'] = {}
                 if 'colors' in p:
@@ -134,6 +136,10 @@ def handle_post(req, data, role, emp):
             rolls = int(req.form.get('rolls', 0))
         except ValueError:
             rolls = 0
+        try:
+            box_qty = int(req.form.get('box_qty', 1))
+        except ValueError:
+            box_qty = 1
             
         data['products'].insert(0, {
             'id': str(time.time()),
@@ -141,8 +147,27 @@ def handle_post(req, data, role, emp):
             'description': req.form['description'],
             'price': price,
             'photo': photo,
+            'box_qty': box_qty,
             'stocks': {loc_id: rolls}
         })
+
+    elif action == 'edit' and role == 'admin':
+        idx = int(req.form['index'])
+        if 0 <= idx < len(data['products']):
+            p = data['products'][idx]
+            p['name'] = req.form.get('name', p['name'])
+            p['description'] = req.form.get('description', p.get('description', ''))
+            try:
+                p['price'] = int(req.form.get('price', p.get('price', 0)))
+            except ValueError:
+                pass
+            try:
+                p['box_qty'] = int(req.form.get('box_qty', p.get('box_qty', 1)))
+            except ValueError:
+                pass
+            photo = req.form.get('photo', '')
+            if photo:
+                p['photo'] = photo
         
     elif action == 'delete' and role == 'admin':
         idx = int(req.form['index'])
@@ -259,7 +284,7 @@ MAIN_HTML = '''
         .product-info { padding: 12px; display: flex; flex-direction: column; flex: 1; }
         .product-title { font-size: 1rem; font-weight: 600; margin-bottom: 4px; line-height: 1.2; }
         .product-price { font-size: 1.1rem; font-weight: 700; color: var(--primary); margin-bottom: 4px; }
-        .product-stock { font-size: 0.85rem; color: var(--text-muted); margin-bottom: 12px; }
+        .product-stock { font-size: 0.85rem; color: var(--text-muted); margin-bottom: 4px; }
         .product-actions { display: flex; gap: 8px; align-items: center; margin-top: auto; }
         .qty-input { width: 60px; padding: 8px; border: 1px solid var(--border); border-radius: 8px; text-align: center; font-weight: 600; outline: none; transition: border-color 0.2s; }
         .qty-input:focus { border-color: var(--primary); }
@@ -389,8 +414,9 @@ MAIN_HTML = '''
                 <input type="text" name="name" class="form-control" placeholder="Название" required>
                 <textarea name="description" class="form-control" placeholder="Описание"></textarea>
                 <input type="number" name="price" class="form-control" placeholder="Цена (₸)" required>
+                <input type="number" name="box_qty" class="form-control" placeholder="Штук в коробке" value="1" required>
                 <label style="display:block; margin-bottom:8px; font-size:0.9rem; color:var(--text-muted);">Фото товара (не обязательно)</label>
-                <input type="file" accept="image/*" class="form-control" onchange="processImage(this)">
+                <input type="file" accept="image/*" class="form-control" onchange="processImage(this, 'photo_b64', 'photo_preview')">
                 <input type="hidden" name="photo" id="photo_b64">
                 <img id="photo_preview" style="display:none; width:100%; height:200px; object-fit:cover; border-radius:12px; margin-bottom:16px;">
                 <select name="loc_id" id="add_loc_select" class="form-control" required></select>
@@ -400,6 +426,26 @@ MAIN_HTML = '''
         </div>
     </div>
 
+    <div id="editModal" class="modal-overlay">
+        <div class="modal-content">
+            <button class="close-modal" onclick="closeModal('editModal')">×</button>
+            <h2>Изменить товар</h2>
+            <form method="POST" style="margin-top:16px;">
+                <input type="hidden" name="action" value="edit">
+                <input type="hidden" name="index" id="edit_index">
+                <input type="text" name="name" id="edit_name" class="form-control" placeholder="Название" required>
+                <textarea name="description" id="edit_desc" class="form-control" placeholder="Описание"></textarea>
+                <input type="number" name="price" id="edit_price" class="form-control" placeholder="Цена (₸)" required>
+                <input type="number" name="box_qty" id="edit_box_qty" class="form-control" placeholder="Штук в коробке" required>
+                <label style="display:block; margin-bottom:8px; font-size:0.9rem; color:var(--text-muted);">Новое фото (не обязательно)</label>
+                <input type="file" accept="image/*" class="form-control" onchange="processImage(this, 'edit_photo_b64', 'edit_photo_preview')">
+                <input type="hidden" name="photo" id="edit_photo_b64">
+                <img id="edit_photo_preview" style="display:none; width:100%; height:200px; object-fit:cover; border-radius:12px; margin-bottom:16px;">
+                <button type="submit" class="btn btn-success" style="width:100%; background:var(--primary);">Сохранить изменения</button>
+            </form>
+        </div>
+    </div>
+
     <div id="incomeModal" class="modal-overlay">
         <div class="modal-content">
             <button class="close-modal" onclick="closeModal('incomeModal')">×</button>
@@ -540,26 +586,32 @@ MAIN_HTML = '''
                         <div class="product-title">${p.name}</div>
                         <div class="product-price">${p.price} ₸</div>
                         <div class="product-stock">В наличии: ${stock} шт</div>
+                        <div class="product-stock" style="margin-bottom: 12px;">В коробке: ${p.box_qty || 1} шт</div>
                         `;
                 
                 if (role !== 'public') {
                     if (activeLoc !== 'all') {
                         if (stock > 0) {
-                            html += `<div class="product-actions">
+                            html += `<div class="product-actions" style="margin-bottom:8px;">
                                 <input type="number" id="amt_${pIdx}" class="qty-input" value="1" min="1" max="${stock}">
-                                <button class="btn btn-success" style="padding:8px; flex:1;" onclick="addToCart(${pIdx})">В корзину</button>
-                            </div>`;
+                                <button class="btn btn-success" style="padding:8px; flex:1; font-size:0.9rem;" onclick="addToCart(${pIdx}, false)">В корзину</button>
+                            </div>
+                            <button class="btn btn-primary" style="width:100%; padding:8px; font-size:0.9rem; margin-bottom:8px;" onclick="addToCart(${pIdx}, true)">Коробка + (${p.box_qty || 1} шт)</button>`;
                         }
                         if (role === 'admin') {
-                            html += `<div style="display:flex; gap:6px; margin-top:8px;">
+                            html += `<div style="display:flex; gap:6px; margin-top:auto;">
                                 <button class="btn btn-primary" style="padding:6px; flex:1; font-size:0.8rem;" onclick="openTransfer(${pIdx}, ${stock})">Переместить</button>
+                                <button class="btn btn-success" style="padding:6px; flex:1; font-size:0.8rem; background:#eab308; color:#fff;" onclick="openEdit(${pIdx})">Изменить</button>
                                 <button class="btn btn-danger" style="padding:6px; flex:1; font-size:0.8rem;" onclick="delProd(${pIdx})">Удалить</button>
                             </div>`;
                         }
                     } else {
                         html += `<div style="font-size:0.8rem; color:var(--text-muted); margin-top:auto;">Выберите конкретную локацию вверху для действий</div>`;
                         if (role === 'admin') {
-                            html += `<div style="margin-top:8px;"><button class="btn btn-danger" style="padding:6px; width:100%; font-size:0.8rem;" onclick="delProd(${pIdx})">Удалить</button></div>`;
+                            html += `<div style="display:flex; gap:6px; margin-top:8px;">
+                                <button class="btn btn-success" style="padding:6px; flex:1; font-size:0.8rem; background:#eab308; color:#fff;" onclick="openEdit(${pIdx})">Изменить</button>
+                                <button class="btn btn-danger" style="padding:6px; flex:1; font-size:0.8rem;" onclick="delProd(${pIdx})">Удалить</button>
+                            </div>`;
                         }
                     }
                 }
@@ -570,9 +622,9 @@ MAIN_HTML = '''
             cat.innerHTML = htmlArr.join('');
         }
 
-        function addToCart(pIdx) {
-            let amt = parseInt(document.getElementById('amt_'+pIdx).value);
+        function addToCart(pIdx, isBox = false) {
             let p = data.products[pIdx];
+            let amt = isBox ? parseInt(p.box_qty || 1) : parseInt(document.getElementById('amt_'+pIdx).value);
             let stock = p.stocks[activeLoc] || 0;
             if(amt <= 0 || isNaN(amt)) return alert('Неверное количество');
             
@@ -676,7 +728,27 @@ MAIN_HTML = '''
             openModal('transferModal');
         }
 
-        function processImage(input) {
+        function openEdit(pIdx) {
+            let p = data.products[pIdx];
+            document.getElementById('edit_index').value = pIdx;
+            document.getElementById('edit_name').value = p.name;
+            document.getElementById('edit_desc').value = p.description || '';
+            document.getElementById('edit_price').value = p.price;
+            document.getElementById('edit_box_qty').value = p.box_qty || 1;
+            document.getElementById('edit_photo_b64').value = '';
+            
+            let preview = document.getElementById('edit_photo_preview');
+            if(p.photo) {
+                preview.src = p.photo;
+                preview.style.display = 'block';
+            } else {
+                preview.src = '';
+                preview.style.display = 'none';
+            }
+            openModal('editModal');
+        }
+
+        function processImage(input, b64Id, previewId) {
             if (input.files && input.files[0]) {
                 const reader = new FileReader();
                 reader.onload = function(e) {
@@ -693,8 +765,8 @@ MAIN_HTML = '''
                         const ctx = canvas.getContext('2d');
                         ctx.drawImage(img, 0, 0, w, h);
                         const b64 = canvas.toDataURL('image/jpeg', 0.6);
-                        document.getElementById('photo_b64').value = b64;
-                        const p = document.getElementById('photo_preview');
+                        document.getElementById(b64Id).value = b64;
+                        const p = document.getElementById(previewId);
                         p.src = b64; p.style.display = 'block';
                     }
                     img.src = e.target.result;