Update app.py

app.py

@@ -39,50 +39,36 @@ def load_data():
         with open(DATA_FILE, 'r', encoding='utf-8') as file:
             data = json.load(file)
             if not isinstance(data, dict):
-                data = {'products': [], 'history': []}
+                data = {'products': [], 'history': [], 'orders': []}
             if 'settings' not in data:
-                data['settings'] = {
-                    'warehouses': [{'id': 'w_main', 'name': 'Magazyn główny'}],
-                    'shops': [{'id': 's_main', 'name': 'Główny sklep'}],
-                    'employees': []
-                }
+                data['settings'] = {'employees': []}
             if 'products' not in data:
                 data['products'] = []
             if 'history' not in data:
                 data['history'] = []
+            if 'orders' not in data:
+                data['orders'] = []
             
             for p in data['products']:
-                if 'price_retail' not in p:
-                    p['price_retail'] = p.get('price', 0)
-                if 'price_wholesale' not in p:
-                    p['price_wholesale'] = p.get('price', 0)
+                if 'sack_qty' not in p:
+                    p['sack_qty'] = p.get('box_qty', 1)
                 if 'variants' not in p:
                     p['variants'] = []
                 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:
-                    for c in p['colors']:
-                        for loc, amt in c.get('stocks', {}).items():
-                            p['stocks'][loc] = p['stocks'].get(loc, 0) + amt
-                    del p['colors']
+                    p['stocks'] = {'w_main': 0}
                 
                 for v in p['variants']:
                     if 'stocks' not in v:
-                        v['stocks'] = {}
+                        v['stocks'] = {'w_main': 0}
             return data
     except Exception:
         return {
-            'settings': {
-                'warehouses': [{'id': 'w_main', 'name': 'Magazyn główny'}],
-                'shops': [{'id': 's_main', 'name': 'Główny sklep'}],
-                'employees': []
-            },
+            'settings': {'employees': []},
             'products': [],
-            'history': []
+            'history': [],
+            'orders': []
         }
 
 def save_data(data):
@@ -112,81 +98,59 @@ def periodic_backup():
         upload_db_to_hf()
         time.sleep(800)
 
-def add_history(data, action, product, amount, price, from_loc, to_loc, emp_name):
+def add_history(data, action, product, amount, emp_name):
     data['history'].insert(0, {
         'time': get_almaty_time(),
         'action': action,
         'product': product,
         'amount': amount,
-        'price': price,
-        'from_loc_name': from_loc,
-        'to_loc_name': to_loc,
         'emp_name': emp_name
     })
     data['history'] = data['history'][:1000]
 
-def get_loc_name(data, loc_id):
-    for w in data['settings']['warehouses']:
-        if w['id'] == loc_id: return w['name']
-    for s in data['settings']['shops']:
-        if s['id'] == loc_id: return s['name']
-    return loc_id
-
 def handle_post(req, data, role, emp):
     action = req.form.get('action')
-    emp_name = emp['name'] if emp else 'Admin'
+    if emp:
+        emp_name = emp['name']
+    elif role == 'admin':
+        emp_name = 'Admin'
+    else:
+        emp_name = 'Sklep'
     
     if action == 'add' and role == 'admin':
-        loc_id = req.form.get('loc_id')
-        try:
-            price_retail = int(req.form.get('price_retail', 0))
-        except ValueError:
-            price_retail = 0
-        try:
-            price_wholesale = int(req.form.get('price_wholesale', 0))
-        except ValueError:
-            price_wholesale = 0
-            
         photo = req.form.get('photo', '')
         try:
             rolls = int(req.form.get('rolls', 0))
         except ValueError:
             rolls = 0
         try:
-            box_qty = int(req.form.get('box_qty', 1))
+            sack_qty = int(req.form.get('sack_qty', 1))
         except ValueError:
-            box_qty = 1
+            sack_qty = 1
             
         v_names = req.form.getlist('v_name[]')
-        v_prices = req.form.getlist('v_price[]')
         v_stocks = req.form.getlist('v_stock[]')
         
         variants = []
         has_variants = False
-        for n, pr, st in zip(v_names, v_prices, v_stocks):
+        for n, st in zip(v_names, v_stocks):
             if n.strip():
                 has_variants = True
-                try:
-                    pr_val = int(pr)
-                except ValueError:
-                    pr_val = 0
                 try:
                     st_val = int(st)
                 except ValueError:
                     st_val = 0
-                variants.append({'name': n.strip(), 'price': pr_val, 'stocks': {loc_id: st_val}})
+                variants.append({'name': n.strip(), 'stocks': {'w_main': st_val}})
             
-        p_stocks = {} if has_variants else {loc_id: rolls}
+        p_stocks = {} if has_variants else {'w_main': rolls}
         
         data['products'].insert(0, {
             'id': str(time.time()),
             'name': req.form['name'],
             'description': req.form['description'],
-            'price_retail': price_retail,
-            'price_wholesale': price_wholesale,
             'variants': variants,
             'photo': photo,
-            'box_qty': box_qty,
+            'sack_qty': sack_qty,
             'stocks': p_stocks
         })
 
@@ -197,54 +161,33 @@ def handle_post(req, data, role, emp):
             p['name'] = req.form.get('name', p['name'])
             p['description'] = req.form.get('description', p.get('description', ''))
             try:
-                p['price_retail'] = int(req.form.get('price_retail', p.get('price_retail', 0)))
-            except ValueError:
-                pass
-            try:
-                p['price_wholesale'] = int(req.form.get('price_wholesale', p.get('price_wholesale', 0)))
-            except ValueError:
-                pass
-            try:
-                p['box_qty'] = int(req.form.get('box_qty', p.get('box_qty', 1)))
+                p['sack_qty'] = int(req.form.get('sack_qty', p.get('sack_qty', 1)))
             except ValueError:
                 pass
                 
-            edit_loc_id = req.form.get('edit_loc_id')
             try:
                 new_rolls = int(req.form.get('rolls', 0))
             except ValueError:
                 new_rolls = 0
                 
             v_names = req.form.getlist('v_name[]')
-            v_prices = req.form.getlist('v_price[]')
             v_stocks = req.form.getlist('v_stock[]')
             
             new_variants = []
-            for i, (n, pr, st) in enumerate(zip(v_names, v_prices, v_stocks)):
+            for n, st in zip(v_names, v_stocks):
                 if n.strip():
-                    existing_stocks = p['variants'][i].get('stocks', {}) if 'variants' in p and i < len(p['variants']) else {}
                     try:
                         st_val = int(st)
                     except ValueError:
                         st_val = 0
-                    if edit_loc_id:
-                        existing_stocks[edit_loc_id] = st_val
-                    try:
-                        pr_val = int(pr)
-                    except ValueError:
-                        pr_val = 0
-                    
-                    new_variants.append({'name': n.strip(), 'price': pr_val, 'stocks': existing_stocks})
+                    new_variants.append({'name': n.strip(), 'stocks': {'w_main': st_val}})
                     
             p['variants'] = new_variants
             
-            if new_variants:
-                pass
-            else:
+            if not new_variants:
                 if 'stocks' not in p:
                     p['stocks'] = {}
-                if edit_loc_id:
-                    p['stocks'][edit_loc_id] = new_rolls
+                p['stocks']['w_main'] = new_rolls
             
             photo = req.form.get('photo', '')
             if photo:
@@ -255,12 +198,11 @@ def handle_post(req, data, role, emp):
         if 0 <= idx < len(data['products']):
             del_name = data['products'][idx]['name']
             data['products'].pop(idx)
-            add_history(data, 'Usunięcie', del_name, 0, 0, '', '', emp_name)
+            add_history(data, 'Usunięcie', del_name, 0, emp_name)
             
     elif action == 'income' and role == 'admin':
         idx = int(req.form['product_index'])
         amt = int(req.form['rolls'])
-        loc_id = req.form['loc_id']
         v_idx_str = req.form.get('v_index')
         p = data['products'][idx]
         
@@ -270,96 +212,60 @@ def handle_post(req, data, role, emp):
             if 0 <= v_idx < len(p.get('variants', [])):
                 v = p['variants'][v_idx]
                 if 'stocks' not in v: v['stocks'] = {}
-                v['stocks'][loc_id] = v['stocks'].get(loc_id, 0) + amt
+                v['stocks']['w_main'] = v['stocks'].get('w_main', 0) + amt
                 prod_name_history += f" ({v['name']})"
         else:
             if 'stocks' not in p: p['stocks'] = {}
-            p['stocks'][loc_id] = p.get('stocks', {}).get(loc_id, 0) + amt
+            p['stocks']['w_main'] = p.get('stocks', {}).get('w_main', 0) + amt
             
-        add_history(data, 'Dostawa', prod_name_history, amt, p.get('price_wholesale', 0), '', get_loc_name(data, loc_id), emp_name)
-        
-    elif action == 'transfer' and role == 'admin':
-        idx = int(req.form['pIndex'])
-        try:
-            v_idx = int(req.form.get('vIndex', -1))
-        except ValueError:
-            v_idx = -1
-        amt = int(req.form['amt'])
-        from_loc = req.form['from_loc']
-        to_loc = req.form['to_loc']
-        p = data['products'][idx]
-        
-        prod_name_history = p['name']
-        if v_idx != -1 and 0 <= v_idx < len(p.get('variants', [])):
-            v = p['variants'][v_idx]
-            av = v.get('stocks', {}).get(from_loc, 0)
-            if amt > av: amt = av
-            if amt > 0:
-                v['stocks'][from_loc] -= amt
-                v['stocks'][to_loc] = v.get('stocks', {}).get(to_loc, 0) + amt
-                prod_name_history += f" ({v['name']})"
-        else:
-            av = p.get('stocks', {}).get(from_loc, 0)
-            if amt > av: amt = av
-            if amt > 0:
-                p['stocks'][from_loc] -= amt
-                p['stocks'][to_loc] = p.get('stocks', {}).get(to_loc, 0) + amt
-                
-        if amt > 0:
-            from_name = get_loc_name(data, from_loc)
-            to_name = get_loc_name(data, to_loc)
-            add_history(data, 'Przeniesienie', prod_name_history, amt, 0, from_name, to_name, emp_name)
+        add_history(data, 'Dostawa', prod_name_history, amt, emp_name)
 
-    elif action == 'checkout':
+    elif action == 'place_order':
         cart_data = req.form.get('cart', '[]')
         cart = json.loads(cart_data)
-        for item in cart:
-            idx = item.get('pIndex')
-            v_idx = item.get('vIndex', -1)
-            amt = item.get('amt')
-            loc = item.get('loc')
-            pName = item.get('pName')
-            itemPrice = item.get('price', 0)
-            
-            if 0 <= idx < len(data['products']):
-                p = data['products'][idx]
-                if v_idx != -1 and 0 <= v_idx < len(p.get('variants', [])):
-                    v = p['variants'][v_idx]
-                    av = v.get('stocks', {}).get(loc, 0)
-                    if amt > av: amt = av
-                    if amt > 0:
-                        v['stocks'][loc] -= amt
-                        loc_name = get_loc_name(data, loc)
-                        add_history(data, 'Sprzedaż', pName, amt, itemPrice, loc_name, '', emp_name)
-                else:
-                    av = p.get('stocks', {}).get(loc, 0)
-                    if amt > av: amt = av
-                    if amt > 0:
-                        p['stocks'][loc] -= amt
-                        loc_name = get_loc_name(data, loc)
-                        add_history(data, 'Sprzedaż', pName, amt, itemPrice, loc_name, '', emp_name)
-
-    elif action == 'add_loc' and role == 'admin':
-        l_type = req.form['l_type']
-        l_name = req.form['l_name']
-        l_id = f"loc_{int(time.time()*1000)}"
-        data['settings'][l_type].append({'id': l_id, 'name': l_name})
-        
-    elif action == 'del_loc' and role == 'admin':
-        l_type = req.form['l_type']
-        l_id = req.form['l_id']
-        data['settings'][l_type] = [x for x in data['settings'][l_type] if x['id'] != l_id]
+        if cart:
+            data['orders'].append({
+                'id': str(time.time()),
+                'time': get_almaty_time(),
+                'emp_name': emp_name,
+                'items': cart,
+                'status': 'pending'
+            })
+
+    elif action == 'approve_order' and role == 'admin':
+        order_id = req.form.get('order_id')
+        order = next((o for o in data['orders'] if o['id'] == order_id), None)
+        if order and order['status'] == 'pending':
+            for item in order['items']:
+                idx = item.get('pIndex')
+                v_idx = item.get('vIndex', -1)
+                amt = item.get('amt')
+                if 0 <= idx < len(data['products']):
+                    p = data['products'][idx]
+                    if v_idx != -1 and 0 <= v_idx < len(p.get('variants', [])):
+                        v = p['variants'][v_idx]
+                        v['stocks']['w_main'] = v.get('stocks', {}).get('w_main', 0) - amt
+                    else:
+                        p['stocks']['w_main'] = p.get('stocks', {}).get('w_main', 0) - amt
+                    add_history(data, 'Wydano do sklepu', item.get('pName'), amt, order['emp_name'])
+            order['status'] = 'approved'
+
+    elif action == 'reject_order' and role == 'admin':
+        order_id = req.form.get('order_id')
+        order = next((o for o in data['orders'] if o['id'] == order_id), None)
+        if order and order['status'] == 'pending':
+            order['status'] = 'rejected'
         
     elif action == 'add_emp' and role == 'admin':
         e_name = req.form['e_name']
-        e_shop = req.form['e_shop']
         e_id = str(uuid.uuid4())[:8]
-        data['settings']['employees'].append({'id': e_id, 'name': e_name, 'token': e_id, 'shop_id': e_shop})
+        data['settings']['employees'].append({'id': e_id, 'name': e_name, 'token': e_id})
         
     elif action == 'del_emp' and role == 'admin':
         e_id = req.form['e_id']
         data['settings']['employees'] = [x for x in data['settings']['employees'] if x['id'] != e_id]
 
+
 MAIN_HTML = '''
 <!DOCTYPE html>
 <html lang="pl">
@@ -398,12 +304,6 @@ MAIN_HTML = '''
         .nav-btn { flex: 0 0 auto; padding: 10px 16px; border-radius: 8px; border: none; background: #e5e7eb; color: var(--text-muted); font-weight: 600; font-size: 0.9rem; cursor: pointer; transition: background 0.2s, color 0.2s; }
         .nav-btn.active { background: var(--primary); color: white; }
         
-        .loc-nav { display: flex; gap: 8px; margin-bottom: 16px; overflow-x: auto; padding-bottom: 4px; }
-        .loc-btn { flex: 0 0 auto; padding: 8px 14px; border-radius: 20px; border: 1px solid var(--border); background: var(--surface); color: var(--text-main); font-weight: 500; font-size: 0.85rem; cursor: pointer; transition: all 0.2s; }
-        .loc-btn.active { background: var(--text-main); color: white; border-color: var(--text-main); }
-        .loc-btn.has-search-stock { border-color: var(--success) !important; color: var(--success) !important; background: #ecfdf5 !important; font-weight: 700; }
-        .loc-btn.has-search-stock.active { background: var(--success) !important; color: white !important; }
-        
         .search-box { width: 100%; padding: 14px; border: 1px solid var(--border); border-radius: 12px; outline: none; font-size: 1rem; margin-bottom: 16px; transition: border-color 0.2s; }
         .search-box:focus { border-color: var(--primary); }
         
@@ -415,8 +315,7 @@ MAIN_HTML = '''
         .product-img { width: 100%; height: 100%; object-fit: cover; }
         .product-info { display: flex; flex-direction: column; flex: 1; justify-content: center; min-width: 0; }
         .product-title { font-size: 0.95rem; font-weight: 600; line-height: 1.2; margin-bottom: 2px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
-        .product-price { font-size: 0.85rem; font-weight: 700; color: var(--primary); }
-        .product-stock { font-size: 0.75rem; color: var(--text-muted); }
+        .product-stock { font-size: 0.75rem; color: var(--text-muted); margin-top:4px; }
         .product-actions { display: flex; flex-direction: column; gap: 6px; width: 100%; margin-top: 4px; }
         
         .qty-input { width: 60px; padding: 6px; border: 1px solid var(--border); border-radius: 6px; text-align: center; font-weight: 600; outline: none; font-size: 0.85rem; transition: border-color 0.2s; }
@@ -448,15 +347,11 @@ MAIN_HTML = '''
         
         .cart-float { display: none; position: fixed; bottom: 24px; right: 24px; background: var(--text-main); color: white; padding: 14px 24px; border-radius: 30px; box-shadow: 0 4px 12px rgba(0,0,0,0.2); cursor: pointer; z-index: 100; font-weight: 600; align-items: center; gap: 8px; transition: transform 0.2s; }
         .cart-float:active { transform: scale(0.95); }
-        
-        .invoice-table { width: 100%; border-collapse: collapse; margin-bottom: 16px; }
-        .invoice-table th, .invoice-table td { padding: 10px; border-bottom: 1px solid var(--border); text-align: left; font-size:0.9rem; }
-        .invoice-total { font-size: 1.2rem; font-weight: 700; text-align: right; }
 
         @media (min-width: 768px) {
             body { padding: 24px; }
             .top-actions { max-width: 400px; }
-            .settings-grid { grid-template-columns: repeat(3, 1fr); gap: 24px; }
+            .settings-grid { grid-template-columns: repeat(2, 1fr); gap: 24px; }
             .modal-overlay { align-items: center; }
             .modal-content { border-radius: 20px; max-width: 500px; }
         }
@@ -468,7 +363,7 @@ MAIN_HTML = '''
     </div>
 
     <div class="container">
-        <h1 id="main_title">Zarządzanie zapasami</h1>
+        <h1 id="main_title">Sklep - Katalog</h1>
         
         {% if role == 'admin' %}
         <div class="top-actions">
@@ -477,6 +372,7 @@ MAIN_HTML = '''
         </div>
         <div class="main-nav">
             <button id="navbtn_catalog" class="nav-btn active" onclick="switchNav('catalog')">Katalog</button>
+            <button id="navbtn_orders" class="nav-btn" onclick="switchNav('orders')">Zamówienia</button>
             <button id="navbtn_reports" class="nav-btn" onclick="switchNav('reports')">Raporty</button>
             <button id="navbtn_settings" class="nav-btn" onclick="switchNav('settings')">Ustawienia</button>
         </div>
@@ -487,11 +383,14 @@ MAIN_HTML = '''
         {% endif %}
         
         <div id="section_catalog">
-            <div class="loc-nav" id="loc_nav_container"></div>
             <input type="text" id="search" class="search-box" placeholder="Szukaj produktu..." oninput="onSearchInput()">
             <div id="catalog"></div>
         </div>
 
+        <div id="section_orders" style="display:none;">
+            <div id="orders_container"></div>
+        </div>
+
         <div id="section_reports" style="display:none;">
             <div style="display:flex; flex-wrap:wrap; gap:12px; margin-bottom:12px;">
                 <input type="date" id="hist_from" class="form-control" style="flex:1; margin:0;" onchange="renderHistory()">
@@ -501,65 +400,32 @@ MAIN_HTML = '''
                 <select id="hist_emp" class="form-control" style="flex:1; margin:0;" onchange="renderHistory()"></select>
                 <select id="hist_action_type" class="form-control" style="flex:1; margin:0;" onchange="renderHistory()">
                     <option value="all">Wszystkie operacje</option>
-                    <option value="Sprzedaż">Wszystkie sprzedaże</option>
-                    <option value="Sprzedaż_retail">Sprzedaż (Detaliczna)</option>
-                    <option value="Sprzedaż_wholesale">Sprzedaż (Hurtowa)</option>
+                    <option value="Wydano do sklepu">Sprzedane do sklepu</option>
                     <option value="Dostawa">Dostawy</option>
-                    <option value="Przeniesienie">Przeniesienia</option>
                     <option value="Usunięcie">Usunięcia</option>
                 </select>
             </div>
-            <h3 id="total_sales" style="margin-bottom:16px; color:var(--primary);"></h3>
             <div id="history_container"></div>
         </div>
 
         <div id="section_settings" style="display:none;">
             <div class="settings-grid">
                 <div class="settings-card">
-                    <h3>Katalogi publiczne</h3>
+                    <h3>Katalog publiczny</h3>
                     <div class="settings-list-item">
-                        <div class="settings-list-item-header"><span style="font-weight:600;">Katalog detaliczny</span></div>
                         <div class="settings-link-box">
-                            <input type="text" class="settings-link-input" value="{{ request.host_url }}catalog/retail" readonly onclick="this.select()">
-                            <button type="button" onclick="navigator.clipboard.writeText('{{ request.host_url }}catalog/retail');alert('Link skopiowany')" class="btn btn-primary" style="padding:8px 12px; font-size:0.85rem; flex:0 0 auto;">Kopiuj</button>
-                        </div>
-                    </div>
-                    <div class="settings-list-item">
-                        <div class="settings-list-item-header"><span style="font-weight:600;">Katalog hurtowy</span></div>
-                        <div class="settings-link-box">
-                            <input type="text" class="settings-link-input" value="{{ request.host_url }}catalog/wholesale" readonly onclick="this.select()">
-                            <button type="button" onclick="navigator.clipboard.writeText('{{ request.host_url }}catalog/wholesale');alert('Link skopiowany')" class="btn btn-primary" style="padding:8px 12px; font-size:0.85rem; flex:0 0 auto;">Kopiuj</button>
+                            <input type="text" class="settings-link-input" value="{{ request.host_url }}" readonly onclick="this.select()">
+                            <button type="button" onclick="navigator.clipboard.writeText('{{ request.host_url }}');alert('Link skopiowany')" class="btn btn-primary" style="padding:8px 12px; font-size:0.85rem; flex:0 0 auto;">Kopiuj</button>
                         </div>
                     </div>
                 </div>
                 
-                <div class="settings-card">
-                    <h3>Magazyny</h3>
-                    <div id="set_warehouses"></div>
-                    <form method="POST" onsubmit="return showLoader(this)" style="display:flex; gap:8px; margin-top:12px;">
-                        <input type="hidden" name="action" value="add_loc">
-                        <input type="hidden" name="l_type" value="warehouses">
-                        <input type="text" name="l_name" class="form-control" style="margin:0;" placeholder="Nazwa" required>
-                        <button type="submit" class="btn btn-primary" style="flex:0 0 auto; padding:0 20px;">+</button>
-                    </form>
-                </div>
-                <div class="settings-card">
-                    <h3>Sklepy</h3>
-                    <div id="set_shops"></div>
-                    <form method="POST" onsubmit="return showLoader(this)" style="display:flex; gap:8px; margin-top:12px;">
-                        <input type="hidden" name="action" value="add_loc">
-                        <input type="hidden" name="l_type" value="shops">
-                        <input type="text" name="l_name" class="form-control" style="margin:0;" placeholder="Nazwa" required>
-                        <button type="submit" class="btn btn-primary" style="flex:0 0 auto; padding:0 20px;">+</button>
-                    </form>
-                </div>
                 <div class="settings-card">
                     <h3>Pracownicy</h3>
                     <div id="set_emps"></div>
                     <form method="POST" onsubmit="return showLoader(this)" style="display:flex; flex-direction:column; gap:8px; margin-top:12px;">
                         <input type="hidden" name="action" value="add_emp">
                         <input type="text" name="e_name" class="form-control" style="margin:0;" placeholder="Imię pracownika" required>
-                        <select name="e_shop" id="emp_shop_select" class="form-control" style="margin:0;" required></select>
                         <button type="submit" class="btn btn-primary" style="padding:10px;">Dodaj pracownika</button>
                     </form>
                 </div>
@@ -568,7 +434,7 @@ MAIN_HTML = '''
     </div>
 
     <div class="cart-float" id="cart_btn" onclick="openCart()">
-        Koszyk (<span id="cart_count">0</span>)
+        Zamówienie (<span id="cart_count">0</span>)
     </div>
 
     <div id="imageZoomModal" class="modal-overlay" onclick="closeModal('imageZoomModal')" style="z-index:2000; align-items:center;">
@@ -584,22 +450,15 @@ MAIN_HTML = '''
                 <input type="text" name="name" class="form-control" placeholder="Nazwa" required>
                 <textarea name="description" class="form-control" placeholder="Opis"></textarea>
                 
-                <div style="display:flex; gap:8px; margin-bottom:12px;">
-                    <input type="number" name="price_retail" class="form-control" style="margin-bottom:0;" placeholder="Cena detaliczna (₸)" required>
-                    <input type="number" name="price_wholesale" class="form-control" style="margin-bottom:0;" placeholder="Cena hurtowa (₸)" required>
-                </div>
-                
-                <select name="loc_id" id="add_loc_select" class="form-control" required></select>
-                
                 <label style="display:block; margin-bottom:8px; font-weight:600; font-size:0.9rem;">Warianty produktu (opcjonalnie)</label>
                 <div id="add_variants_container"></div>
                 <button type="button" class="btn btn-success" style="padding:8px; font-size:0.85rem; margin-bottom:12px; width:100%; background:#eab308;" onclick="addVariantField('add_variants_container')">+ Dodaj wariant</button>
                 
                 <div id="add_base_stock_container">
-                    <input type="number" name="rolls" id="add_rolls" class="form-control" placeholder="Ilość początkowa" value="0" required>
+                    <input type="number" name="rolls" id="add_rolls" class="form-control" placeholder="Ilość początkowa w magazynie" value="0" required>
                 </div>
                 
-                <input type="number" name="box_qty" class="form-control" placeholder="Sztuk w kartonie" value="1" required>
+                <input type="number" name="sack_qty" class="form-control" placeholder="Sztuk w worku" value="1" required>
                 
                 <label style="display:block; margin-bottom:8px; font-size:0.9rem; color:var(--text-muted);">Zdjęcie produktu (opcjonalnie)</label>
                 <input type="file" accept="image/*" class="form-control" onchange="processImage(this, 'photo_b64', 'photo_preview')">
@@ -621,14 +480,7 @@ MAIN_HTML = '''
                 <input type="text" name="name" id="edit_name" class="form-control" placeholder="Nazwa" required>
                 <textarea name="description" id="edit_desc" class="form-control" placeholder="Opis"></textarea>
                 
-                <div style="display:flex; gap:8px; margin-bottom:12px;">
-                    <input type="number" name="price_retail" id="edit_price_retail" class="form-control" style="margin-bottom:0;" placeholder="Cena detaliczna (₸)" required>
-                    <input type="number" name="price_wholesale" id="edit_price_wholesale" class="form-control" style="margin-bottom:0;" placeholder="Cena hurtowa (₸)" required>
-                </div>
-                
-                <label style="display:block; margin-bottom:4px; font-weight:600; font-size:0.9rem;">Stany magazynowe w lokalizacjach</label>
-                <select name="edit_loc_id" id="edit_loc_id" class="form-control" onchange="loadEditStocks()"></select>
-                
+                <label style="display:block; margin-bottom:4px; font-weight:600; font-size:0.9rem;">Stan na magazynie</label>
                 <div id="edit_base_stock_container" style="margin-bottom:12px;">
                     <input type="number" name="rolls" id="edit_rolls" class="form-control" placeholder="Całkowity stan (bez wariantów)">
                 </div>
@@ -637,7 +489,7 @@ MAIN_HTML = '''
                 <div id="edit_variants_container"></div>
                 <button type="button" class="btn btn-success" style="padding:8px; font-size:0.85rem; margin-bottom:12px; width:100%; background:#eab308;" onclick="addVariantField('edit_variants_container')">+ Dodaj wariant</button>
                 
-                <input type="number" name="box_qty" id="edit_box_qty" class="form-control" placeholder="Sztuk w kartonie" required>
+                <input type="number" name="sack_qty" id="edit_sack_qty" class="form-control" placeholder="Sztuk w worku" required>
                 
                 <label style="display:block; margin-bottom:8px; font-size:0.9rem; color:var(--text-muted);">Nowe zdjęcie (opcjonalnie)</label>
                 <input type="file" accept="image/*" class="form-control" onchange="processImage(this, 'edit_photo_b64', 'edit_photo_preview')">
@@ -652,10 +504,9 @@ MAIN_HTML = '''
     <div id="incomeModal" class="modal-overlay">
         <div class="modal-content">
             <button class="close-modal" onclick="closeModal('incomeModal')">×</button>
-            <h2>Dostawa</h2>
+            <h2>Dostawa do magazynu</h2>
             <form method="POST" style="margin-top:16px;" onsubmit="return showLoader(this)">
                 <input type="hidden" name="action" value="income">
-                <select name="loc_id" id="inc_loc_select" class="form-control" required></select>
                 <select name="product_index" id="inc_product" class="form-control" onchange="updateIncVariants()" required></select>
                 <select name="v_index" id="inc_variant" class="form-control" style="display:none;"></select>
                 <input type="number" name="rolls" class="form-control" placeholder="Ilość" min="1" required>
@@ -664,38 +515,12 @@ MAIN_HTML = '''
         </div>
     </div>
 
-    <div id="transferModal" class="modal-overlay">
-        <div class="modal-content">
-            <button class="close-modal" onclick="closeModal('transferModal')">×</button>
-            <h2>Przeniesienie</h2>
-            <form method="POST" style="margin-top:16px;" onsubmit="return showLoader(this)">
-                <input type="hidden" name="action" value="transfer">
-                <input type="hidden" name="pIndex" id="trans_pIndex">
-                <input type="hidden" name="vIndex" id="trans_vIndex">
-                <input type="hidden" name="from_loc" id="trans_from">
-                <p id="trans_info" style="margin-bottom:16px; font-weight:600;"></p>
-                <select name="to_loc" id="trans_dest_select" class="form-control" required></select>
-                <input type="number" name="amt" id="trans_amt" class="form-control" placeholder="Ilość" min="1" required>
-                <button type="submit" class="btn btn-primary" style="width:100%;">Przenieś</button>
-            </form>
-        </div>
-    </div>
-
     <div id="cartModal" class="modal-overlay">
         <div class="modal-content">
             <button class="close-modal" onclick="closeModal('cartModal')">×</button>
-            <h2>Koszyk</h2>
+            <h2>Twoje zamówienie</h2>
             <div id="cart_items" style="margin-bottom:16px; margin-top:16px;"></div>
-            <button id="checkout_btn" class="btn btn-success" style="width:100%;" onclick="submitCart()">Wystaw rachunek</button>
-        </div>
-    </div>
-
-    <div id="invoiceModal" class="modal-overlay">
-        <div class="modal-content">
-            <button class="close-modal" onclick="closeInvoice()">×</button>
-            <h2 style="text-align:center; margin-bottom:16px;">Rachunek</h2>
-            <div id="invoice_content"></div>
-            <button class="btn btn-primary" style="width:100%; margin-top:20px;" onclick="closeInvoice()">Gotowe</button>
+            <button id="checkout_btn" class="btn btn-success" style="width:100%;" onclick="submitCart()">Wyślij zamówienie</button>
         </div>
     </div>
 
@@ -707,10 +532,8 @@ MAIN_HTML = '''
     <script>
         const data = {{ data|tojson }};
         const role = "{{ role }}";
-        const price_type = "{{ price_type }}";
         const hostUrl = "{{ request.host_url }}";
-        const currentEmp = {{ emp|tojson }};
-        let activeLoc = 'all';
+        const currentEmp = {{ emp|tojson if emp else 'null' }};
         let cart = [];
         let searchTimeout;
 
@@ -724,63 +547,30 @@ MAIN_HTML = '''
         }
 
         function init() {
-            if (role === 'admin' || role === 'employee') {
-                document.getElementById('main_title').innerText = role === 'admin' ? 'Panel administratora' : 'Panel pracownika';
-            } else {
-                document.getElementById('main_title').innerText = price_type === 'wholesale' ? 'Katalog hurtowy' : 'Katalog detaliczny';
-            }
-            buildLocNav();
             if (role === 'admin') {
+                document.getElementById('main_title').innerText = 'Panel administratora';
                 buildSettings();
                 buildIncProducts();
-                buildLocSelects();
                 buildEmpSelect();
                 initHistoryDates();
+            } else if (role === 'employee') {
+                document.getElementById('main_title').innerText = 'Katalog - Pracownik';
+            } else {
+                document.getElementById('main_title').innerText = 'Sklep - Katalog';
             }
             renderCatalog();
         }
 
         function switchNav(nav) {
-            ['catalog', 'reports', 'settings'].forEach(id => {
+            ['catalog', 'orders', 'reports', 'settings'].forEach(id => {
                 const el = document.getElementById('section_' + id);
                 if(el) el.style.display = (id === nav) ? 'block' : 'none';
             });
             document.querySelectorAll('.nav-btn').forEach(b => b.classList.remove('active'));
-            document.getElementById('navbtn_' + nav).classList.add('active');
+            const btn = document.getElementById('navbtn_' + nav);
+            if(btn) btn.classList.add('active');
             if (nav === 'reports') renderHistory();
-        }
-
-        function buildLocNav() {
-            const cont = document.getElementById('loc_nav_container');
-            if(!cont) return;
-            let html = `<button class="loc-btn active" id="locbtn_all" onclick="setLoc('all')">Wszystkie lokalizacje</button>`;
-            
-            data.settings.warehouses.forEach(w => {
-                html += `<button class="loc-btn" id="locbtn_${w.id}" onclick="setLoc('${w.id}')">${w.name}</button>`;
-            });
-            
-            let allowedShops = data.settings.shops;
-            if (role === 'employee' && currentEmp && currentEmp.shop_id) {
-                allowedShops = data.settings.shops.filter(s => s.id === currentEmp.shop_id);
-            }
-            
-            allowedShops.forEach(s => {
-                html += `<button class="loc-btn" id="locbtn_${s.id}" onclick="setLoc('${s.id}')">${s.name}</button>`;
-            });
-            cont.innerHTML = html;
-        }
-
-        function setLoc(locId) {
-            activeLoc = locId;
-            document.querySelectorAll('.loc-btn').forEach(b => b.classList.remove('active'));
-            document.getElementById('locbtn_' + locId).classList.add('active');
-            renderCatalog();
-        }
-
-        function getLocName(locId) {
-            let locs = [...data.settings.warehouses, ...data.settings.shops];
-            let found = locs.find(l => l.id === locId);
-            return found ? found.name : locId;
+            if (nav === 'orders') renderOrders();
         }
 
         function zoomImage(src) {
@@ -798,113 +588,46 @@ MAIN_HTML = '''
             const q = document.getElementById('search').value.toLowerCase().trim();
             const cat = document.getElementById('catalog');
             let htmlArr = [];
-            let locationsWithStock = new Set();
-            
-            let validLocs = (activeLoc === 'all') 
-                ? ((role === 'employee' && currentEmp && currentEmp.shop_id) 
-                    ? [currentEmp.shop_id, ...data.settings.warehouses.map(w=>w.id)]
-                    : [...data.settings.warehouses.map(w=>w.id), ...data.settings.shops.map(s=>s.id)])
-                : [activeLoc];
-                
-            let getLocStock = (stocksObj) => {
-                let s = 0;
-                for (let l of validLocs) {
-                    if (stocksObj && stocksObj[l]) s += stocksObj[l];
-                }
-                return s;
-            };
             
             data.products.forEach((p, pIdx) => {
                 let match = p.name.toLowerCase().includes(q) || (p.description && p.description.toLowerCase().includes(q));
                 if (!match) return;
                 
-                if (q !== '') {
-                    if (p.variants && p.variants.length > 0) {
-                        p.variants.forEach(v => {
-                            for (let loc in v.stocks) {
-                                if (v.stocks[loc] > 0) locationsWithStock.add(loc);
-                            }
-                        });
-                    } else {
-                        for (let loc in p.stocks) {
-                            if (p.stocks[loc] > 0) locationsWithStock.add(loc);
-                        }
-                    }
-                }
-                
                 let stock = 0;
                 if (p.variants && p.variants.length > 0) {
-                    p.variants.forEach(v => { stock += getLocStock(v.stocks); });
+                    p.variants.forEach(v => { stock += (v.stocks && v.stocks['w_main']) ? v.stocks['w_main'] : 0; });
                 } else {
-                    stock += getLocStock(p.stocks);
+                    stock += (p.stocks && p.stocks['w_main']) ? p.stocks['w_main'] : 0;
                 }
                 
-                if (activeLoc !== 'all' && stock <= 0) return;
-                
-                let imgHtml = p.photo ? `<img src="${p.photo}" class="product-img">` : `<span style="font-size:0.6rem; color:#9ca3af;">Brak zdjęcia</span>`;
+                let imgHtml = p.photo ? `<img src="${p.photo}" class="product-img">` : `<span style="font-size:0.6rem; color:#9ca3af;">Brak</span>`;
                 let imgClick = p.photo ? `onclick="zoomImage('${p.photo}')"` : ``;
                 
-                let priceHtml = '';
-                if (role !== 'public') {
-                    priceHtml = `
-                        <div style="display:flex; gap:6px; align-items:center; font-size:0.8rem; margin:4px 0; flex-wrap:wrap;">
-                            Detal: <input type="number" id="price_ret_${pIdx}" value="${p.price_retail}" style="width:65px; padding:2px 4px; border:1px solid var(--border); border-radius:4px; font-weight:600;" onclick="this.select()"> ₸
-                            | Hurt: <input type="number" id="price_whl_${pIdx}" value="${p.price_wholesale}" style="width:65px; padding:2px 4px; border:1px solid var(--border); border-radius:4px; font-weight:600;" onclick="this.select()"> ₸
-                        </div>
-                    `;
-                } else {
-                    priceHtml = `
-                        <div class="product-price" style="margin:4px 0;">
-                            ${price_type === 'both' ? `Detal: ${p.price_retail} ₸ | Hurt: ${p.price_wholesale} ₸` : (price_type === 'retail' ? `${p.price_retail} ₸` : `${p.price_wholesale} ₸`)}
-                        </div>
-                    `;
+                let varHtml = '';
+                if (p.variants && p.variants.length > 0) {
+                    varHtml = `<select id="var_${pIdx}" class="form-control" style="padding:6px; font-size:0.8rem; margin-bottom:4px; height:auto;" onchange="updateMaxQty(${pIdx})">
+                        ${p.variants.map((v, i) => `<option value="${i}">${v.name}</option>`).join('')}
+                    </select>`;
                 }
                 
-                let actionsHtml = '';
-                if (role !== 'public') {
-                    if (activeLoc !== 'all') {
-                        if (stock > 0) {
-                            let varHtml = '';
-                            if (p.variants && p.variants.length > 0) {
-                                varHtml = `<select id="var_${pIdx}" class="form-control" style="padding:6px; font-size:0.8rem; margin-bottom:4px; height:auto;" onchange="updateMaxQty(${pIdx})">
-                                    ${p.variants.map((v, i) => `<option value="${i}">${v.name} (+${v.price} ₸)</option>`).join('')}
-                                </select>`;
-                            }
-                            
-                            actionsHtml += `
-                                <div class="product-actions">
-                                    ${varHtml}
-                                    <div style="display:flex; gap:6px; align-items:center; width:100%;">
-                                        <input type="number" id="amt_${pIdx}" class="qty-input" value="1" min="1">
-                                        <button class="btn btn-success" style="padding:8px 6px; font-size:0.75rem; flex:1;" onclick="addToCart(${pIdx}, false, 'retail')">Do koszyka (Detal)</button>
-                                        <button class="btn btn-primary" style="padding:8px 6px; font-size:0.75rem; flex:1;" onclick="addToCart(${pIdx}, false, 'wholesale')">Do koszyka (Hurt)</button>
-                                    </div>
-                                    <div style="display:flex; gap:6px; width:100%; margin-top:2px;">
-                                        <button class="btn btn-success" style="padding:8px 6px; font-size:0.75rem; flex:1; background:#059669;" onclick="addToCart(${pIdx}, true, 'retail')">Karton (Detal)</button>
-                                        <button class="btn btn-primary" style="padding:8px 6px; font-size:0.75rem; flex:1; background:#4338ca;" onclick="addToCart(${pIdx}, true, 'wholesale')">Karton (Hurt)</button>
-                                    </div>
-                            `;
-                            if (role === 'admin') {
-                                actionsHtml += `<div style="display:flex; gap:6px; margin-top:2px; width:100%;">
-                                    <button class="btn btn-primary" style="padding:8px 6px; flex:1; font-size:0.75rem;" onclick="openTransfer(${pIdx})">Przenieś</button>
-                                    <button class="btn btn-success" style="padding:8px 6px; flex:1; font-size:0.75rem; background:#eab308;" onclick="openEdit(${pIdx})">Edytuj</button>
-                                    <button class="btn btn-danger" style="padding:8px 6px; flex:1; font-size:0.75rem;" onclick="delProd(${pIdx})">Usuń</button>
-                                </div>`;
-                            }
-                            actionsHtml += `</div>`;
-                        }
-                    } else {
-                        actionsHtml += `<div class="product-actions">
-                            <div style="font-size:0.8rem; color:var(--text-muted); text-align:center; margin:8px 0;">Wybierz lokalizację, aby wykonać akcję</div>`;
-                        if (role === 'admin') {
-                            actionsHtml += `<div style="display:flex; gap:6px; width:100%;">
-                                <button class="btn btn-success" style="padding:8px; flex:1; font-size:0.75rem; background:#eab308;" onclick="openEdit(${pIdx})">Edytuj</button>
-                                <button class="btn btn-danger" style="padding:8px; flex:1; font-size:0.75rem;" onclick="delProd(${pIdx})">Usuń</button>
-                            </div>`;
-                        }
-                        actionsHtml += `</div>`;
-                    }
+                let actionsHtml = `
+                    <div class="product-actions">
+                        ${varHtml}
+                        <div style="display:flex; gap:6px; align-items:center; width:100%;">
+                            <input type="number" id="amt_${pIdx}" class="qty-input" value="1" min="1">
+                            <button class="btn btn-primary" style="padding:8px 6px; font-size:0.75rem; flex:1;" onclick="addToCart(${pIdx}, false)">Dodaj do zamówienia (Szt.)</button>
+                        </div>
+                        <div style="display:flex; gap:6px; width:100%; margin-top:2px;">
+                            <button class="btn btn-success" style="padding:8px 6px; font-size:0.75rem; flex:1; background:#059669;" onclick="addToCart(${pIdx}, true)">Cały worek do zamówienia</button>
+                        </div>
+                `;
+                if (role === 'admin') {
+                    actionsHtml += `<div style="display:flex; gap:6px; margin-top:2px; width:100%;">
+                        <button class="btn btn-success" style="padding:8px 6px; flex:1; font-size:0.75rem; background:#eab308;" onclick="openEdit(${pIdx})">Edytuj</button>
+                        <button class="btn btn-danger" style="padding:8px 6px; flex:1; font-size:0.75rem;" onclick="delProd(${pIdx})">Usuń</button>
+                    </div>`;
                 }
+                actionsHtml += `</div>`;
 
                 let html = `<div class="product">
                     <div class="product-main">
@@ -912,8 +635,7 @@ MAIN_HTML = '''
                         <div class="product-info">
                             <div class="product-title">${p.name}</div>
                             ${p.description ? `<div style="font-size:0.75rem; color:var(--text-muted);">${p.description}</div>` : ''}
-                            ${priceHtml}
-                            <div class="product-stock">Dostępność: <span id="stock_display_${pIdx}">${stock}</span> szt. | W kartonie: ${p.box_qty || 1} szt.</div>
+                            <div class="product-stock">Dostępność na magazynie: <span id="stock_display_${pIdx}">${stock}</span> szt. | W worku: ${p.sack_qty || 1} szt.</div>
                         </div>
                     </div>
                     ${actionsHtml}
@@ -921,16 +643,6 @@ MAIN_HTML = '''
                 htmlArr.push(html);
             });
             cat.innerHTML = htmlArr.join('');
-
-            document.querySelectorAll('.loc-btn').forEach(btn => {
-                if (btn.id === 'locbtn_all') return;
-                let locId = btn.id.replace('locbtn_', '');
-                if (q !== '' && locationsWithStock.has(locId)) {
-                    btn.classList.add('has-search-stock');
-                } else {
-                    btn.classList.remove('has-search-stock');
-                }
-            });
             
             data.products.forEach((p, pIdx) => {
                 if(document.getElementById('stock_display_' + pIdx)) {
@@ -943,29 +655,15 @@ MAIN_HTML = '''
             let p = data.products[pIdx];
             let vSelect = document.getElementById('var_' + pIdx);
             let qtyInput = document.getElementById('amt_' + pIdx);
-            
-            let validLocs = (activeLoc === 'all') 
-                ? ((role === 'employee' && currentEmp && currentEmp.shop_id) 
-                    ? [currentEmp.shop_id, ...data.settings.warehouses.map(w=>w.id)]
-                    : [...data.settings.warehouses.map(w=>w.id), ...data.settings.shops.map(s=>s.id)])
-                : [activeLoc];
-                
-            let getLocStock = (stocksObj) => {
-                let s = 0;
-                for (let l of validLocs) {
-                    if (stocksObj && stocksObj[l]) s += stocksObj[l];
-                }
-                return s;
-            };
 
             let max = 0;
             if (vSelect && vSelect.value !== "") {
                 let vIdx = parseInt(vSelect.value);
-                max = getLocStock(p.variants[vIdx].stocks);
+                max = p.variants[vIdx].stocks['w_main'] || 0;
             } else if (p.variants && p.variants.length > 0) {
-                max = getLocStock(p.variants[0].stocks);
+                max = p.variants[0].stocks['w_main'] || 0;
             } else {
-                max = getLocStock(p.stocks);
+                max = p.stocks['w_main'] || 0;
             }
             
             if(qtyInput) qtyInput.max = max;
@@ -975,63 +673,28 @@ MAIN_HTML = '''
             }
         }
 
-        function addToCart(pIdx, isBox, pType) {
+        function addToCart(pIdx, isSack) {
             let p = data.products[pIdx];
             let vSelect = document.getElementById('var_'+pIdx);
             let vIdx = (vSelect && vSelect.value !== '') ? parseInt(vSelect.value) : -1;
+            let amt = isSack ? parseInt(p.sack_qty || 1) : parseInt(document.getElementById('amt_'+pIdx).value);
             
-            let amt = isBox ? parseInt(p.box_qty || 1) : parseInt(document.getElementById('amt_'+pIdx).value);
-            
-            let validLocs = (activeLoc === 'all') 
-                ? ((role === 'employee' && currentEmp && currentEmp.shop_id) 
-                    ? [currentEmp.shop_id, ...data.settings.warehouses.map(w=>w.id)]
-                    : [...data.settings.warehouses.map(w=>w.id), ...data.settings.shops.map(s=>s.id)])
-                : [activeLoc];
-                
-            let getLocStock = (stocksObj) => {
-                let s = 0;
-                for (let l of validLocs) {
-                    if (stocksObj && stocksObj[l]) s += stocksObj[l];
-                }
-                return s;
-            };
-            
-            let stock = (vIdx !== -1) ? getLocStock(p.variants[vIdx].stocks) : getLocStock(p.stocks);
+            let stock = (vIdx !== -1) ? (p.variants[vIdx].stocks['w_main'] || 0) : (p.stocks['w_main'] || 0);
             
             if(amt <= 0 || isNaN(amt)) return alert('Nieprawidłowa ilość');
-            if(activeLoc !== 'all' && amt > stock) return alert('Przekroczono stan magazynowy');
             
-            let basePrice = pType === 'wholesale' ? p.price_wholesale : p.price_retail;
-            if (role !== 'public') {
-                if (pType === 'wholesale') {
-                    let customPriceInput = document.getElementById('price_whl_' + pIdx);
-                    if (customPriceInput) basePrice = parseInt(customPriceInput.value) || basePrice;
-                } else {
-                    let customPriceInput = document.getElementById('price_ret_' + pIdx);
-                    if (customPriceInput) basePrice = parseInt(customPriceInput.value) || basePrice;
-                }
-            }
+            let vName = vIdx !== -1 ? ' (' + p.variants[vIdx].name + ')' : '';
+            let finalName = p.name + vName;
             
-            let vName = '';
-            let vPrice = 0;
-            if (vIdx !== -1) {
-                let variant = p.variants[vIdx];
-                vName = ' (' + variant.name + ')';
-                vPrice = variant.price;
-            }
+            let existing = cart.find(i => i.pIndex === pIdx && i.vIndex === vIdx && i.pName === finalName);
+            let cartTotalForProduct = cart.filter(i => i.pIndex === pIdx && i.vIndex === vIdx).reduce((s, i) => s + i.amt, 0);
             
-            let finalPrice = basePrice + vPrice;
-            let finalName = p.name + vName + (pType === 'wholesale' ? ' [Hurt]' : ' [Detal]');
-            
-            let existing = cart.find(i => i.pIndex === pIdx && i.vIndex === vIdx && i.loc === activeLoc && i.pName === finalName && i.price === finalPrice);
-            let cartTotalForProduct = cart.filter(i => i.pIndex === pIdx && i.vIndex === vIdx && i.loc === activeLoc).reduce((s, i) => s + i.amt, 0);
-            
-            if(activeLoc !== 'all' && (cartTotalForProduct + amt > stock)) return alert('Przekroczono stan w koszyku');
+            if(cartTotalForProduct + amt > stock) return alert('Przekroczono stan w koszyku (brak na magazynie)');
             
             if(existing) {
                 existing.amt += amt;
             } else {
-                cart.push({pIndex: pIdx, vIndex: vIdx, pName: finalName, price: finalPrice, amt: amt, loc: activeLoc});
+                cart.push({pIndex: pIdx, vIndex: vIdx, pName: finalName, amt: amt});
             }
             updateCartUI();
         }
@@ -1045,22 +708,17 @@ MAIN_HTML = '''
 
         function openCart() {
             let html = '';
-            let total = 0;
             cart.forEach((c, i) => {
-                let sum = c.amt * c.price;
-                total += sum;
                 html += `<div style="display:flex; justify-content:space-between; align-items:center; border-bottom:1px solid var(--border); padding:10px 0;">
                     <div>
                         <div style="font-weight:600;">${c.pName}</div>
-                        <div style="font-size:0.85rem; color:var(--text-muted);">${c.amt} szt. x ${c.price} ₸</div>
+                        <div style="font-size:0.85rem; color:var(--text-muted);">${c.amt} szt.</div>
                     </div>
                     <div style="display:flex; align-items:center; gap:12px;">
-                        <span style="font-weight:700;">${sum} ₸</span>
                         <button style="border:none; background:var(--danger); color:white; border-radius:6px; padding:6px 10px; cursor:pointer; font-weight:700;" onclick="removeFromCart(${i})">×</button>
                     </div>
                 </div>`;
             });
-            html += `<div style="text-align:right; font-size:1.2rem; font-weight:700; margin-top:16px;">Razem: ${total} ₸</div>`;
             document.getElementById('cart_items').innerHTML = html;
             openModal('cartModal');
         }
@@ -1083,29 +741,16 @@ MAIN_HTML = '''
             document.getElementById('loader').style.display = 'flex';
             
             let fd = new FormData();
-            fd.append('action', 'checkout');
+            fd.append('action', 'place_order');
             fd.append('cart', JSON.stringify(cart));
             
             try {
                 await fetch(window.location.href, {method: 'POST', body: fd});
-                
-                let dateStr = new Date().toLocaleString('pl-PL');
-                let html = `<p style="color:var(--text-muted); margin-bottom:16px;">Data: ${dateStr}</p>
-                <table class="invoice-table">
-                    <tr><th>Produkt</th><th>Ilość</th><th>Kwota</th></tr>`;
-                let total = 0;
-                cart.forEach(c => {
-                    let sum = c.amt * c.price;
-                    total += sum;
-                    html += `<tr><td>${c.pName}</td><td>${c.amt}</td><td>${sum} ₸</td></tr>`;
-                });
-                html += `</table><div class="invoice-total">Razem do zapłaty: ${total} ₸</div>`;
-                
-                document.getElementById('invoice_content').innerHTML = html;
-                closeModal('cartModal');
-                openModal('invoiceModal');
+                alert('Zamówienie zostało pomyślnie wysłane!');
                 cart = [];
                 updateCartUI();
+                closeModal('cartModal');
+                window.location.reload();
             } catch (e) {
                 alert('Błąd podczas składania zamówienia');
             } finally {
@@ -1114,51 +759,49 @@ MAIN_HTML = '''
             }
         }
 
-        function closeInvoice() {
-            window.location.reload();
-        }
-
-        function openTransfer(pIdx) {
-            let p = data.products[pIdx];
-            let vSelect = document.getElementById('var_' + pIdx);
-            let vIdx = (vSelect && vSelect.value !== '') ? parseInt(vSelect.value) : -1;
-            
-            let maxStock = 0;
-            let vName = '';
-            if(vIdx !== -1) {
-                maxStock = p.variants[vIdx].stocks[activeLoc] || 0;
-                vName = ' (' + p.variants[vIdx].name + ')';
-            } else {
-                maxStock = p.stocks[activeLoc] || 0;
+        function renderOrders() {
+            const cont = document.getElementById('orders_container');
+            let html = '';
+            const pending = data.orders.filter(o => o.status === 'pending');
+            if(pending.length === 0) {
+                cont.innerHTML = '<p style="text-align:center; margin-top:20px; color:var(--text-muted);">Brak nowych zamówień.</p>';
+                return;
             }
-            
-            if(maxStock <= 0) return alert('Brak w magazynie');
-            
-            document.getElementById('trans_pIndex').value = pIdx;
-            document.getElementById('trans_vIndex').value = vIdx;
-            document.getElementById('trans_from').value = activeLoc;
-            document.getElementById('trans_info').innerText = p.name + vName + ' (Dostępne: ' + maxStock + ' szt.)';
-            document.getElementById('trans_amt').max = maxStock;
-            document.getElementById('trans_amt').value = 1;
-            
-            const dest = document.getElementById('trans_dest_select');
-            dest.innerHTML = '';
-            [...data.settings.warehouses, ...data.settings.shops].forEach(l => {
-                if (l.id !== activeLoc) {
-                    dest.innerHTML += `<option value="${l.id}">${l.name}</option>`;
-                }
+            pending.forEach(o => {
+                let itemsHtml = o.items.map(i => `<li style="font-size:0.9rem; margin-bottom:4px;"><b>${i.pName}</b> - ${i.amt} szt.</li>`).join('');
+                html += `<div class="history-item">
+                    <div class="history-header">
+                        <span>Data: ${o.time}</span>
+                        <span class="history-badge badge-orange">Oczekujące</span>
+                    </div>
+                    <div style="font-size:0.85rem; margin-bottom:8px;">Zleceniodawca: <b>${o.emp_name}</b></div>
+                    <ul style="list-style-type:none; margin-bottom:12px; padding:10px; background:#f9fafb; border-radius:8px;">
+                        ${itemsHtml}
+                    </ul>
+                    <div style="display:flex; gap:8px;">
+                        <form method="POST" onsubmit="return showLoader(this)" style="margin:0; flex:1;">
+                            <input type="hidden" name="action" value="approve_order">
+                            <input type="hidden" name="order_id" value="${o.id}">
+                            <button type="submit" class="btn btn-success" style="width:100%; font-size:0.85rem;">Zatwierdź i wydaj</button>
+                        </form>
+                        <form method="POST" onsubmit="return showLoader(this)" style="margin:0; flex:1;">
+                            <input type="hidden" name="action" value="reject_order">
+                            <input type="hidden" name="order_id" value="${o.id}">
+                            <button type="submit" class="btn btn-danger" style="width:100%; font-size:0.85rem;">Odrzuć</button>
+                        </form>
+                    </div>
+                </div>`;
             });
-            openModal('transferModal');
+            cont.innerHTML = html;
         }
 
-        function addVariantField(containerId, name='', price='', stock='') {
+        function addVariantField(containerId, name='', stock='') {
             const cont = document.getElementById(containerId);
             const div = document.createElement('div');
             div.style = "display:flex; gap:8px; margin-bottom:8px; align-items:center;";
             div.innerHTML = `
                 <input type="text" name="v_name[]" class="form-control" style="margin:0; flex:1;" placeholder="Nazwa" value="${name}" required>
-                <input type="number" name="v_price[]" class="form-control" style="margin:0; width:90px;" placeholder="Cena" value="${price}" required>
-                <input type="number" name="v_stock[]" class="form-control v-stock-input" style="margin:0; width:90px;" placeholder="Stan" value="${stock}" required>
+                <input type="number" name="v_stock[]" class="form-control v-stock-input" style="margin:0; width:90px;" placeholder="Stan mag." value="${stock}" required>
                 <button type="button" style="border:none; background:var(--danger); color:white; border-radius:8px; padding:10px; cursor:pointer;" onclick="removeVariantField(this, '${containerId}')">×</button>
             `;
             cont.appendChild(div);
@@ -1188,18 +831,13 @@ MAIN_HTML = '''
             document.getElementById('edit_index').value = pIdx;
             document.getElementById('edit_name').value = p.name;
             document.getElementById('edit_desc').value = p.description || '';
-            document.getElementById('edit_price_retail').value = p.price_retail || p.price || 0;
-            document.getElementById('edit_price_wholesale').value = p.price_wholesale || p.price || 0;
-            document.getElementById('edit_box_qty').value = p.box_qty || 1;
+            document.getElementById('edit_sack_qty').value = p.sack_qty || 1;
             document.getElementById('edit_photo_b64').value = '';
             
-            let locSelect = document.getElementById('edit_loc_id');
-            locSelect.innerHTML = [...data.settings.warehouses, ...data.settings.shops].map(l => `<option value="${l.id}">${l.name}</option>`).join('');
-            
             document.getElementById('edit_variants_container').innerHTML = '';
             if (p.variants && p.variants.length > 0) {
                 p.variants.forEach(v => {
-                    addVariantField('edit_variants_container', v.name, v.price, 0);
+                    addVariantField('edit_variants_container', v.name, v.stocks['w_main'] || 0);
                 });
             }
             
@@ -1219,18 +857,10 @@ MAIN_HTML = '''
         function loadEditStocks() {
             let pIdx = document.getElementById('edit_index').value;
             let p = data.products[pIdx];
-            let locId = document.getElementById('edit_loc_id').value;
-            
             if (p.variants && p.variants.length > 0) {
-                let stockInputs = document.querySelectorAll('#edit_variants_container .v-stock-input');
-                p.variants.forEach((v, i) => {
-                    if(stockInputs[i]) {
-                        stockInputs[i].value = (v.stocks && v.stocks[locId]) ? v.stocks[locId] : 0;
-                    }
-                });
                 document.getElementById('edit_base_stock_container').style.display = 'none';
             } else {
-                document.getElementById('edit_rolls').value = (p.stocks && p.stocks[locId]) ? p.stocks[locId] : 0;
+                document.getElementById('edit_rolls').value = p.stocks['w_main'] || 0;
                 document.getElementById('edit_base_stock_container').style.display = 'block';
             }
         }
@@ -1276,20 +906,11 @@ MAIN_HTML = '''
         function closeModal(id) { document.getElementById(id).classList.remove('active'); }
 
         function buildSettings() {
-            const wCont = document.getElementById('set_warehouses');
-            wCont.innerHTML = data.settings.warehouses.map(w => `<div class="settings-list-item"><div class="settings-list-item-header"><span style="font-weight:600;">${w.name}</span><form method="POST" onsubmit="return showLoader(this)" style="margin:0;"><input type="hidden" name="action" value="del_loc"><input type="hidden" name="l_type" value="warehouses"><input type="hidden" name="l_id" value="${w.id}"><button type="submit" class="btn btn-danger" style="padding:6px 12px; font-size:0.85rem;">Usuń</button></form></div></div>`).join('');
-            
-            const sCont = document.getElementById('set_shops');
-            sCont.innerHTML = data.settings.shops.map(s => `<div class="settings-list-item"><div class="settings-list-item-header"><span style="font-weight:600;">${s.name}</span><form method="POST" onsubmit="return showLoader(this)" style="margin:0;"><input type="hidden" name="action" value="del_loc"><input type="hidden" name="l_type" value="shops"><input type="hidden" name="l_id" value="${s.id}"><button type="submit" class="btn btn-danger" style="padding:6px 12px; font-size:0.85rem;">Usuń</button></form></div></div>`).join('');
-            
             const eCont = document.getElementById('set_emps');
-            eCont.innerHTML = data.settings.employees.map(e => {
-                let shop = data.settings.shops.find(s => s.id === e.shop_id);
-                let shopName = shop ? shop.name : 'Nie przypisano';
-                return `
+            eCont.innerHTML = data.settings.employees.map(e => `
                 <div class="settings-list-item">
                     <div class="settings-list-item-header">
-                        <span style="font-weight:600;">${e.name} <small style="color:var(--text-muted)">(${shopName})</small></span>
+                        <span style="font-weight:600;">${e.name}</span>
                         <form method="POST" onsubmit="return showLoader(this)" style="margin:0;">
                             <input type="hidden" name="action" value="del_emp">
                             <input type="hidden" name="e_id" value="${e.id}">
@@ -1301,17 +922,7 @@ MAIN_HTML = '''
                         <button type="button" onclick="navigator.clipboard.writeText('${hostUrl}emp/${e.token}');alert('Link skopiowany')" class="btn btn-primary" style="padding:8px 12px; font-size:0.85rem; flex:0 0 auto;">Kopiuj</button>
                     </div>
                 </div>
-            `}).join('');
-        }
-
-        function buildLocSelects() {
-            const locs = [...data.settings.warehouses, ...data.settings.shops];
-            const opts = locs.map(l => `<option value="${l.id}">${l.name}</option>`).join('');
-            document.getElementById('add_loc_select').innerHTML = opts;
-            document.getElementById('inc_loc_select').innerHTML = opts;
-            
-            const shopOpts = data.settings.shops.map(s => `<option value="${s.id}">${s.name}</option>`).join('');
-            document.getElementById('emp_shop_select').innerHTML = '<option value="">-- Wybierz sklep --</option>' + shopOpts;
+            `).join('');
         }
 
         function buildIncProducts() {
@@ -1341,7 +952,7 @@ MAIN_HTML = '''
 
         function buildEmpSelect() {
             const sel = document.getElementById('hist_emp');
-            sel.innerHTML = '<option value="all">Wszyscy pracownicy</option><option value="Admin">Admin</option>' + data.settings.employees.map(e => `<option value="${e.name}">${e.name}</option>`).join('');
+            sel.innerHTML = '<option value="all">Wszyscy</option><option value="Admin">Admin</option><option value="Sklep">Sklep</option>' + data.settings.employees.map(e => `<option value="${e.name}">${e.name}</option>`).join('');
         }
 
         function initHistoryDates() {
@@ -1360,45 +971,30 @@ MAIN_HTML = '''
             const eFilter = document.getElementById('hist_emp').value;
             const actFilter = document.getElementById('hist_action_type').value;
             
-            let total = 0;
-            
             data.history.forEach(h => {
                 const pts = h.time.split(' ')[0].split('.');
                 const hd = new Date(`${pts[2]}-${pts[1]}-${pts[0]}T${h.time.split(' ')[1]}`);
                 
                 let passAction = true;
                 if (actFilter !== 'all') {
-                    if (actFilter === 'Sprzedaż') {
-                        passAction = h.action === 'Sprzedaż';
-                    } else if (actFilter === 'Sprzedaż_retail') {
-                        passAction = h.action === 'Sprzedaż' && h.product.includes('[Detal]');
-                    } else if (actFilter === 'Sprzedaż_wholesale') {
-                        passAction = h.action === 'Sprzedaż' && h.product.includes('[Hurt]');
-                    } else {
-                        passAction = h.action === actFilter;
-                    }
+                    passAction = h.action === actFilter;
                 }
                 
                 if (hd >= fDate && hd <= tDate && (eFilter === 'all' || h.emp_name === eFilter) && passAction) {
-                    if (h.action === 'Sprzedaż') total += (h.amount * h.price);
-                    
                     let bCls = h.action.includes('Dostawa') ? 'badge-green' : 'badge-orange';
-                    let locInfo = h.action === 'Przeniesienie' ? `${h.from_loc_name} ➔ ${h.to_loc_name}` : (h.from_loc_name || h.to_loc_name);
-                    
                     htmlArr.push(`<div class="history-item">
                         <div class="history-header">
                             <span>${h.time} | ${h.emp_name}</span>
                             <span class="history-badge ${bCls}">${h.action}</span>
                         </div>
                         <div class="history-body">
-                            <span class="history-prod">${h.product}<br><small style="color:var(--text-muted)">${locInfo}</small></span>
-                            <span style="font-weight:700; text-align:right;">${h.amount} szt. ${h.price > 0 ? `<br><small style="color:var(--primary)">${h.amount * h.price} ₸</small>` : ''}</span>
+                            <span class="history-prod">${h.product}</span>
+                            <span style="font-weight:700; text-align:right;">${h.amount} szt.</span>
                         </div>
                     </div>`);
                 }
             });
             hc.innerHTML = htmlArr.join('');
-            document.getElementById('total_sales').innerText = `Suma sprzedaży: ${total} ₸`;
         }
 
         init();
@@ -1409,17 +1005,8 @@ MAIN_HTML = '''
 
 @app.route('/')
 def public_index():
-    return redirect(url_for('public_retail'))
-
-@app.route('/catalog/retail')
-def public_retail():
-    data = load_data()
-    return render_template_string(MAIN_HTML, data=data, role='public', emp=None, price_type='retail')
-
-@app.route('/catalog/wholesale')
-def public_wholesale():
     data = load_data()
-    return render_template_string(MAIN_HTML, data=data, role='public', emp=None, price_type='wholesale')
+    return render_template_string(MAIN_HTML, data=data, role='public', emp=None)
 
 @app.route('/admin', methods=['GET', 'POST'])
 def admin_panel():
@@ -1428,7 +1015,7 @@ def admin_panel():
         handle_post(request, data, 'admin', None)
         save_data(data)
         return redirect(url_for('admin_panel'))
-    return render_template_string(MAIN_HTML, data=data, role='admin', emp=None, price_type='both')
+    return render_template_string(MAIN_HTML, data=data, role='admin', emp=None)
 
 @app.route('/emp/<token>', methods=['GET', 'POST'])
 def employee_panel(token):
@@ -1440,7 +1027,7 @@ def employee_panel(token):
         handle_post(request, data, 'employee', emp)
         save_data(data)
         return redirect(f'/emp/{token}')
-    return render_template_string(MAIN_HTML, data=data, role='employee', emp=emp, price_type='both')
+    return render_template_string(MAIN_HTML, data=data, role='employee', emp=emp)
 
 if __name__ == '__main__':
     load_data()