Update app.py

app.py

@@ -150,6 +150,7 @@ def load_data():
                         'use_barcodes': False,
                         'business_type': 'mixed',
                         'system_mode': 'both',
+                        'hide_stock_online': False,
                         'customer_fields': {
                             'name': True, 'phone': True, 'city': True, 'address': False, 'zip': False
                         },
@@ -164,7 +165,7 @@ def load_data():
 
         changed = False
         for env_id, env_data in data.items():
-            if 'products' not in env_data: env_data['products'] = []
+            if 'products' not in env_data: env_data['products'] =[]
             if 'categories' not in env_data: env_data['categories'] =[]
             if 'orders' not in env_data: env_data['orders'] = {}
             if 'staff' not in env_data: env_data['staff'] =[]
@@ -184,6 +185,7 @@ def load_data():
             if 'use_barcodes' not in settings: settings['use_barcodes'] = False; changed = True
             if 'business_type' not in settings: settings['business_type'] = 'mixed'; changed = True
             if 'system_mode' not in settings: settings['system_mode'] = 'both'; changed = True
+            if 'hide_stock_online' not in settings: settings['hide_stock_online'] = False; changed = True
             if 'customer_fields' not in settings:
                 settings['customer_fields'] = {'name': True, 'phone': True, 'city': True, 'address': False, 'zip': False}
                 changed = True
@@ -201,7 +203,7 @@ def load_data():
                 if 'box_price' not in product: product['box_price'] = ""; changed = True
                 if 'min_order' not in product: product['min_order'] = ""; changed = True
                 if 'barcode' not in product: product['barcode'] = ""; changed = True
-                if 'variants' not in product: product['variants'] = []; changed = True
+                if 'variants' not in product: product['variants'] =[]; changed = True
                 if 'has_variant_prices' not in product: product['has_variant_prices'] = False; changed = True
                 if 'stock' not in product: product['stock'] = ""; changed = True
                 for v in product['variants']:
@@ -248,7 +250,7 @@ def get_env_data(env_id):
     if env_id not in all_data:
         all_data[env_id] = {
             'products':[],
-            'categories': [],
+            'categories':[],
             'orders': {},
             'staff': [],
             'inventory_history':[],
@@ -257,12 +259,13 @@ def get_env_data(env_id):
                 'admin_password_enabled': False,
                 'admin_password': '',
                 'logo_url': DEFAULT_LOGO_URL,
-                'whatsapp_number': DEFAULT_WHATSAPP_NUMBER,
+                'whatsapp_number': DEFAULT_WHAPP_NUMBER if 'DEFAULT_WHATSAPP_NUMBER' in globals() else DEFAULT_WHATSAPP_NUMBER,
                 'currency': 'T',
                 'track_inventory': False,
                 'use_barcodes': False,
                 'business_type': 'mixed',
                 'system_mode': 'both',
+                'hide_stock_online': False,
                 'customer_fields': {'name': True, 'phone': True, 'city': True, 'address': False, 'zip': False},
                 'socials': {
                     'wa': {'enabled': True, 'url': ''},
@@ -291,7 +294,7 @@ def update_order_totals(order, business_type):
         c_box_price = float(i.get('cart_box_price', 0))
         item_discount = float(i.get('discount', 0))
         
-        if business_type in ['mixed', 'wholesale'] and c_box_price > 0 and ppb > 1 and qty >= ppb:
+        if business_type in['mixed', 'wholesale'] and c_box_price > 0 and ppb > 1 and qty >= ppb:
             base_price = c_box_price / ppb
         else:
             base_price = c_price
@@ -305,7 +308,7 @@ def update_order_totals(order, business_type):
     order['total_price'] = round(total, 2)
 
 def is_order_fully_assembled(order):
-    if order.get('status') not in ['confirmed', 'pos']:
+    if order.get('status') not in['confirmed', 'pos']:
         return True
     assembled_data = order.get('assembled', {})
     for item in order.get('cart',[]):
@@ -790,6 +793,7 @@ CATALOG_TEMPLATE = '''
         const mode = '{{ mode }}';
         const staffId = '{{ staff_id }}';
         const trackInventory = {{ 'true' if settings.track_inventory else 'false' }};
+        const hideStockOnline = {{ 'true' if settings.hide_stock_online else 'false' }};
         const businessType = '{{ settings.business_type }}'; 
         const cFields = {{ settings.customer_fields|tojson }};
         
@@ -906,6 +910,7 @@ CATALOG_TEMPLATE = '''
                 if (minO > 1) boxInfoHtml += `<div style="font-size:0.8rem; color:#e17055; font-weight:600;">Мин. заказ: ${minO} шт</div>`;
             }
 
+            let showStock = trackInventory && !(mode !== 'pos' && hideStockOnline);
             let variantsHtml = '';
             let mainControlsHtml = '';
 
@@ -916,7 +921,7 @@ CATALOG_TEMPLATE = '''
                 p.variants.forEach((v, idx) => {
                     let vPrice = p.has_variant_prices ? v.price : p.price;
                     let vBoxPrice = p.has_variant_prices ? (v.box_price || '') : (p.box_price || '');
-                    let vStockHtml = trackInventory && v.stock !== "" && v.stock !== null ? `<div class="variant-stock">Остаток: ${v.stock} шт</div>` : '';
+                    let vStockHtml = showStock && v.stock !== "" && v.stock !== null ? `<div class="variant-stock">Остаток: ${v.stock} шт</div>` : '';
                     let cKey = getCartKey(p.product_id, idx);
                     let qty = cart[cKey] ? cart[cKey].quantity : 0;
                     let vPpb = parseInt(v.pieces_per_box) || ppb;
@@ -951,7 +956,7 @@ CATALOG_TEMPLATE = '''
                 });
                 variantsHtml += `</div>`;
             } else {
-                let mStockHtml = trackInventory && p.stock !== "" && p.stock !== null ? `<div style="font-size:0.8rem; color:#0984e3; margin-top:4px;">Остаток: ${p.stock} шт</div>` : '';
+                let mStockHtml = showStock && p.stock !== "" && p.stock !== null ? `<div style="font-size:0.8rem; color:#0984e3; margin-top:4px;">Остаток: ${p.stock} шт</div>` : '';
                 let qty = cart[p.product_id] ? cart[p.product_id].quantity : 0;
                 
                 let addBoxBtn = '';
@@ -2388,7 +2393,16 @@ ADMIN_TEMPLATE = '''
                         <div style="font-weight: 600; margin-bottom: 5px; border-top: 1px solid var(--border); padding-top: 15px;">Учет товара:</div>
                         <label><input type="checkbox" name="track_inventory" {% if settings.track_inventory %}checked{% endif %}> Включить остатки на складе</label>
                         <label><input type="checkbox" name="use_barcodes" {% if settings.use_barcodes %}checked{% endif %}> Использовать штрих-коды</label>
+                        {% if sys_mode == 'both' %}
+                        <label><input type="checkbox" name="hide_stock_online" {% if settings.hide_stock_online %}checked{% endif %}> Клиент не видит остатков (в каталоге для онлайн заказов)</label>
                         {% endif %}
+                        {% endif %}
+
+                        <div style="font-weight: 600; margin-bottom: 5px; border-top: 1px solid var(--border); padding-top: 15px; margin-top: 10px;">Безопасность (Админ-панель):</div>
+                        <div class="social-item" style="margin-bottom: 10px;">
+                            <label style="width: auto; margin-right: 15px;"><input type="checkbox" name="admin_password_enabled" {% if settings.admin_password_enabled %}checked{% endif %}> Пароль на вход</label>
+                            <input type="text" name="admin_password" value="{{ settings.admin_password }}" placeholder="Установите пароль" style="flex: 1; min-width: 150px;">
+                        </div>
 
                         <div style="font-weight: 600; margin-bottom: 5px; border-top: 1px solid var(--border); padding-top: 15px; margin-top: 10px;">Социальные сети:</div>
                         <div class="social-item">
@@ -3609,6 +3623,7 @@ def create_environment():
             "use_barcodes": False,
             "business_type": "mixed",
             "system_mode": "both",
+            "hide_stock_online": False,
             "customer_fields": {'name': True, 'phone': True, 'city': True, 'address': False, 'zip': False},
             "socials": {
                 'wa': {'enabled': True, 'url': ''},
@@ -3698,7 +3713,7 @@ def admin_logout(env_id):
 @app.route('/<env_id>/catalog')
 def catalog(env_id):
     data = get_env_data(env_id)
-    all_products = data.get('products', [])
+    all_products = data.get('products',[])
     categories = data.get('categories',[])
     settings = data.get('settings', {})
     
@@ -3765,7 +3780,7 @@ def finish_assembly(env_id, order_id):
     new_cart = []
     
     track_inv = data['settings'].get('track_inventory', False) and data['settings'].get('system_mode', 'both') != 'external'
-    is_stock_deducted = order.get('status') in ['confirmed', 'pos']
+    is_stock_deducted = order.get('status') in['confirmed', 'pos']
 
     for item in order.get('cart',[]):
         c_key = item.get('c_key')
@@ -3985,7 +4000,7 @@ def apply_discount(env_id, order_id):
     except ValueError:
         order['global_discount'] = 0
 
-    for item in order.get('cart', []):
+    for item in order.get('cart',[]):
         item_disc = request.form.get(f"item_discount_{item['c_key']}", 0)
         try:
             item['discount'] = float(item_disc)
@@ -4140,12 +4155,12 @@ def admin(env_id):
     if settings.get('admin_password_enabled') and not session.get(f'admin_auth_{env_id}'):
         return redirect(url_for('admin_login', env_id=env_id))
         
-    products = data.get('products', [])
+    products = data.get('products',[])
     categories = data.get('categories',[])
     staff = data.get('staff',[])
     orders = data.get('orders', {})
     
-    pending_orders = [o for o in orders.values() if o.get('status') == 'pending']
+    pending_orders =[o for o in orders.values() if o.get('status') == 'pending']
     pending_orders.sort(key=lambda x: x.get('created_at', ''), reverse=True)
     
     unassembled_count = len([o for o in orders.values() if not is_order_fully_assembled(o)])
@@ -4176,9 +4191,14 @@ def admin(env_id):
             if settings.get('system_mode', 'both') == 'external':
                 settings['track_inventory'] = False
                 settings['use_barcodes'] = False
+                settings['hide_stock_online'] = False
             else:
                 settings['track_inventory'] = 'track_inventory' in request.form
                 settings['use_barcodes'] = 'use_barcodes' in request.form
+                settings['hide_stock_online'] = 'hide_stock_online' in request.form
+            
+            settings['admin_password_enabled'] = 'admin_password_enabled' in request.form
+            settings['admin_password'] = request.form.get('admin_password', '').strip()
             
             settings['customer_fields'] = {
                 'name': 'cf_name' in request.form,
@@ -4508,4 +4528,4 @@ if __name__ == '__main__':
         threading.Thread(target=periodic_backup, daemon=True).start()
 
     port = int(os.environ.get('PORT', 7860))
-    app.run(host='0.0.0.0', port=port)
+    app.run(host='0.0.0.0', port=port)