Update app.py

app.py

@@ -41,9 +41,9 @@ DATA_FILES = {
 
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN_WRITE", "YOUR_WRITE_TOKEN_HERE")
 HF_TOKEN_READ = os.getenv("HF_TOKEN_READ", "YOUR_READ_TOKEN_HERE")
-REPO_ID = "Kgshop/morshenbase"
+REPO_ID = "Kgshop/morshenbasekz"
 
-BISHKEK_TZ = pytz.timezone('Asia/Bishkek')
+BISHKEK_TZ = pytz.timezone('Asia/Almaty')
 
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 
@@ -198,7 +198,7 @@ def generate_receipt_html(transaction):
                 <tbody>{items_html}</tbody>
             </table>
             <p>--------------------------------</p>
-            <p class="total">Итого: {format_currency_py(transaction['total_amount'])} с</p>
+            <p class="total">Итого: {format_currency_py(transaction['total_amount'])} ₸</p>
             <p>Способ оплаты: {'Наличные' if transaction['payment_method'] == 'cash' else 'Карта'}</p>
             <p>--------------------------------</p>
             <p>Спасибо за покупку!</p>
@@ -1125,11 +1125,8 @@ BASE_TEMPLATE = """
         <p>Чек успешно создан.</p>
         <div class="mb-3">
             <label for="whatsapp-phone" class="form-label">Отправить чек на WhatsApp</label>
-            <div class="input-group">
-                <span class="input-group-text">+996</span>
-                <input type="tel" class="form-control" id="whatsapp-phone" placeholder="555123456">
-            </div>
-            <div class="form-text">Введите номер без +996.</div>
+            <input type="tel" class="form-control" id="whatsapp-phone" placeholder="996555123456">
+            <div class="form-text">Введите полный номер с кодом страны (без +).</div>
         </div>
         <input type="hidden" id="receipt-url">
       </div>
@@ -1203,9 +1200,9 @@ SALES_SCREEN_CONTENT = """
                             <h6 class="card-title small mb-1">{{ p.name }}</h6>
                             <p class="card-text fw-bold mb-0">
                                 {% if p.variants|length > 1 %}
-                                    от {{ format_currency_py(p.variants|map(attribute='price')|min) }} с
+                                    от {{ format_currency_py(p.variants|map(attribute='price')|min) }} ₸
                                 {% elif p.variants|length == 1 %}
-                                    {{ format_currency_py(p.variants[0].price) }} с
+                                    {{ format_currency_py(p.variants[0].price) }} ₸
                                 {% else %}
                                     Нет в наличии
                                 {% endif %}
@@ -1228,7 +1225,7 @@ SALES_SCREEN_CONTENT = """
                 <div id="cart-items" class="list-group mb-3"></div>
                 <div class="d-flex justify-content-between align-items-center mb-3">
                     <h4 class="mb-0">Итого:</h4>
-                    <h4 class="mb-0" id="cart-total">0,00 с</h4>
+                    <h4 class="mb-0" id="cart-total">0,00 ₸</h4>
                 </div>
                 <div class="d-grid gap-2">
                     <div class="btn-group"><button class="btn btn-success flex-grow-1" id="pay-cash-btn"><i class="fas fa-money-bill-wave me-2"></i>Наличные</button><button class="btn btn-info flex-grow-1" id="pay-card-btn"><i class="far fa-credit-card me-2"></i>Карта</button></div>
@@ -1282,7 +1279,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 <div class="list-group-item d-flex justify-content-between align-items-center">
                     <div>
                         <h6 class="mb-0 small">${item.productName} (${item.variantName})</h6>
-                        <small>${item.price} с</small>
+                        <small>${item.price} ₸</small>
                     </div>
                     <div class="d-flex align-items-center">
                         <button class="btn btn-sm btn-outline-secondary cart-qty-btn" data-id="${id}" data-op="-1">-</button>
@@ -1291,7 +1288,7 @@ document.addEventListener('DOMContentLoaded', () => {
                     </div>
                 </div>`;
         }
-        cartTotalEl.textContent = total.toLocaleString('ru-RU', {minimumFractionDigits: 2, maximumFractionDigits: 2}) + ' с';
+        cartTotalEl.textContent = total.toLocaleString('ru-RU', {minimumFractionDigits: 2, maximumFractionDigits: 2}) + ' ₸';
     };
 
     const addToCart = (product, variant) => {
@@ -1325,7 +1322,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 const btn = document.createElement('button');
                 btn.type = 'button';
                 btn.className = 'list-group-item list-group-item-action';
-                btn.innerHTML = `${variant.option_value} - <strong>${parseFloat(variant.price).toLocaleString('ru-RU', {minimumFractionDigits: 2})} с</strong> <span class="badge bg-secondary float-end">Остаток: ${variant.stock}</span>`;
+                btn.innerHTML = `${variant.option_value} - <strong>${parseFloat(variant.price).toLocaleString('ru-RU', {minimumFractionDigits: 2})} ₸</strong> <span class="badge bg-secondary float-end">Остаток: ${variant.stock}</span>`;
                 btn.addEventListener('click', () => {
                     addToCart(product, variant);
                     variantSelectModal.hide();
@@ -1434,7 +1431,7 @@ document.addEventListener('DOMContentLoaded', () => {
         const phone = document.getElementById('whatsapp-phone').value.replace(/\\D/g, '');
         const receiptUrl = document.getElementById('receipt-url').value;
         if (phone && receiptUrl) {
-            const fullPhone = '996' + phone;
+            const fullPhone = phone;
             const message = encodeURIComponent(`Ваш чек: ${receiptUrl}`);
             window.open(`https://wa.me/${fullPhone}?text=${message}`, '_blank');
         } else {
@@ -1514,8 +1511,8 @@ INVENTORY_CONTENT = """
                 {% for v in p.variants %}
                 <tr>
                     <td>{{ v.option_value }}</td>
-                    <td>{{ format_currency_py(v.price) }} с</td>
-                    <td>{{ format_currency_py(v.cost_price) }} с</td>
+                    <td>{{ format_currency_py(v.price) }} ₸</td>
+                    <td>{{ format_currency_py(v.cost_price) }} ₸</td>
                     <td>{{ v.stock }}</td>
                 </tr>
                 {% else %}
@@ -1751,7 +1748,7 @@ TRANSACTIONS_CONTENT = """
                     <td>{{ t.timestamp[:16]|replace('T', ' ') }}</td>
                     <td><span class="badge bg-{{'primary' if t.type == 'sale' else 'warning'}}">{{'Продажа' if t.type == 'sale' else 'Возврат'}}</span></td>
                     <td>{{ t.user_name }}</td><td>{{ t.kassa_name }}</td>
-                    <td class="fw-bold">{{ format_currency_py(t.total_amount) }} с</td>
+                    <td class="fw-bold">{{ format_currency_py(t.total_amount) }} ₸</td>
                     <td><span class="badge bg-{{'success' if t.status == 'completed' else 'secondary'}}">{{t.status}}</span></td>
                     <td>
                         <ul class="list-unstyled mb-0 small">
@@ -1788,12 +1785,12 @@ REPORTS_CONTENT = """
             <div class="card-header"><h5 class="mb-0">Сводный отчет за период</h5></div>
             <div class="card-body">
                 <ul class="list-group list-group-flush">
-                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-chart-bar me-2 text-primary"></i>Выручка (за вычетом возвратов)</span> <strong>{{ format_currency_py(stats.total_revenue) }} с</strong></li>
-                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-cogs me-2 text-secondary"></i>Себестоимость проданных товаров</span> <strong>{{ format_currency_py(stats.total_cogs) }} с</strong></li>
-                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-piggy-bank me-2 text-info"></i>Валовая прибыль</span> <strong class="text-info">{{ format_currency_py(stats.gross_profit) }} с</strong></li>
-                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-receipt me-2 text-warning"></i>Расходы (операционные)</span> <strong class="text-warning">-{{ format_currency_py(stats.total_expenses) }} с</strong></li>
-                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-users-cog me-2 text-danger"></i>Расходы (зарплаты)</span> <strong class="text-danger">-{{ format_currency_py(stats.total_salary_expenses) }} с</strong></li>
-                    <li class="list-group-item d-flex justify-content-between fs-5"><span><i class="fas fa-check-circle me-2 text-success"></i>Чистая прибыль</span> <strong class="text-success">{{ format_currency_py(stats.net_profit) }} с</strong></li>
+                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-chart-bar me-2 text-primary"></i>Выручка (за вычетом возвратов)</span> <strong>{{ format_currency_py(stats.total_revenue) }} ₸</strong></li>
+                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-cogs me-2 text-secondary"></i>Себестоимость проданных товаров</span> <strong>{{ format_currency_py(stats.total_cogs) }} ₸</strong></li>
+                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-piggy-bank me-2 text-info"></i>Валовая прибыль</span> <strong class="text-info">{{ format_currency_py(stats.gross_profit) }} ₸</strong></li>
+                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-receipt me-2 text-warning"></i>Расходы (операционные)</span> <strong class="text-warning">-{{ format_currency_py(stats.total_expenses) }} ₸</strong></li>
+                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-users-cog me-2 text-danger"></i>Расходы (зарплаты)</span> <strong class="text-danger">-{{ format_currency_py(stats.total_salary_expenses) }} ₸</strong></li>
+                    <li class="list-group-item d-flex justify-content-between fs-5"><span><i class="fas fa-check-circle me-2 text-success"></i>Чистая прибыль</span> <strong class="text-success">{{ format_currency_py(stats.net_profit) }} ₸</strong></li>
                 </ul>
             </div>
         </div>
@@ -1804,7 +1801,7 @@ REPORTS_CONTENT = """
                     <thead><tr><th>Кассир</th><th class="text-end">К выплате</th></tr></thead>
                     <tbody>
                     {% for name, payout in stats.cashier_payouts %}
-                    <tr><td>{{ name }}</td><td class="text-end">{{ format_currency_py(payout) }} с</td></tr>
+                    <tr><td>{{ name }}</td><td class="text-end">{{ format_currency_py(payout) }} ₸</td></tr>
                     {% else %}<tr><td colspan="2" class="text-center text-muted">Нет данных для расчета.</td></tr>
                     {% endfor %}
                     </tbody>
@@ -1820,7 +1817,7 @@ REPORTS_CONTENT = """
                     <thead><tr><th>Кассир</th><th>Чеков</th><th class="text-end">Сумма</th></tr></thead>
                     <tbody>
                     {% for name, data in stats.sales_by_cashier %}
-                    <tr><td>{{ name }}</td><td>{{ data.count }}</td><td class="text-end">{{ format_currency_py(data.total) }} с</td></tr>
+                    <tr><td>{{ name }}</td><td>{{ data.count }}</td><td class="text-end">{{ format_currency_py(data.total) }} ₸</td></tr>
                     {% else %}<tr><td colspan="3" class="text-center text-muted">Нет продаж за выбранный период.</td></tr>
                     {% endfor %}
                     </tbody>
@@ -1837,7 +1834,7 @@ REPORTS_CONTENT = """
                     <tr>
                         <td><small>{{ expense.timestamp[:10] }}</small></td>
                         <td>{{ expense.description }}</td>
-                        <td class="text-end">{{ format_currency_py(expense.amount) }} с</td>
+                        <td class="text-end">{{ format_currency_py(expense.amount) }} ₸</td>
                     </tr>
                     {% else %}<tr><td colspan="3" class="text-center text-muted">Нет расходов за выбранный период.</td></tr>
                     {% endfor %}
@@ -1872,14 +1869,14 @@ PRODUCT_ROI_CONTENT = """
                     <tr>
                         <td><strong>{{ item.name }}</strong><br><small class="text-muted">{{ item.variant_name }}</small></td>
                         <td class="text-end">{{ item.total_qty_sold }}</td>
-                        <td class="text-end">{{ format_currency_py(item.total_revenue) }} с</td>
-                        <td class="text-end">{{ format_currency_py(item.inventory_value) }} с</td>
-                        <td class="text-end text-secondary">{{ format_currency_py(item.total_investment) }} с</td>
+                        <td class="text-end">{{ format_currency_py(item.total_revenue) }} ₸</td>
+                        <td class="text-end">{{ format_currency_py(item.inventory_value) }} ₸</td>
+                        <td class="text-end text-secondary">{{ format_currency_py(item.total_investment) }} ₸</td>
                         <td class="text-end fw-bold 
                             {% if item.payback > 0 %}payback-positive
                             {% elif item.payback < 0 %}payback-negative
                             {% else %}payback-zero{% endif %}">
-                            {{ format_currency_py(item.payback) }} с
+                            {{ format_currency_py(item.payback) }} ₸
                         </td>
                     </tr>
                 {% else %}
@@ -1908,7 +1905,7 @@ ADMIN_CONTENT = """
                     <li class="list-group-item d-flex justify-content-between align-items-center">
                         <div>{{ u.name }} <br>
                         <small class="text-muted">
-                        {% if u.payment_type == 'salary' %}Зарплата: {{ format_currency_py(u.payment_value) }} с/мес.
+                        {% if u.payment_type == 'salary' %}Зарплата: {{ format_currency_py(u.payment_value) }} ₸/мес.
                         {% elif u.payment_type == 'percentage' %}Процент: {{ u.payment_value }}%
                         {% endif %}
                         </small>
@@ -1938,7 +1935,7 @@ ADMIN_CONTENT = """
                 <ul class="list-group">
                     {% for k in kassas %}
                     <li class="list-group-item d-flex justify-content-between align-items-center">
-                        <div>{{ k.name }} <br><small class="fw-bold">{{ format_currency_py(k.balance) }} с</small></div>
+                        <div>{{ k.name }} <br><small class="fw-bold">{{ format_currency_py(k.balance) }} ₸</small></div>
                         <form action="{{ url_for('manage_kassa') }}" method="POST" onsubmit="return confirm('Удалить кассу?');"><input type="hidden" name="action" value="delete"><input type="hidden" name="id" value="{{ k.id }}"><button type="submit" class="btn btn-sm btn-danger"><i class="fas fa-trash"></i></button></form>
                     </li>
                     {% endfor %}
@@ -1981,7 +1978,7 @@ ADMIN_CONTENT = """
                         <tr>
                             <td><small>{{ e.timestamp[:16]|replace('T', ' ') }}</small></td>
                             <td>{{ e.description }}</td>
-                            <td class="text-end fw-bold">{{ format_currency_py(e.amount) }} с</td>
+                            <td class="text-end fw-bold">{{ format_currency_py(e.amount) }} ₸</td>
                         </tr>
                         {% else %}
                         <tr><td colspan="3" class="text-center">Расходов пока нет</td></tr>
@@ -2018,7 +2015,7 @@ ADMIN_CONTENT = """
           <div class="mb-3"><label class="form-label">Имя</label><input type="text" name="name" class="form-control" required></div>
           <div class="mb-3"><label class="form-label">ПИН-код</label><input type="password" name="pin" class="form-control" required></div>
           <div class="mb-3"><label class="form-label">Тип оплаты</label><select name="payment_type" class="form-select"><option value="percentage">Процент от продаж</option><option value="salary">Фиксированная зарплата</option></select></div>
-          <div class="mb-3"><label class="form-label">Значение</label><input type="text" name="payment_value" class="form-control" inputmode="decimal" value="0" required><small class="form-text text-muted">Для процентов - число (напр. 5), для зарплаты - сумма в сомах.</small></div>
+          <div class="mb-3"><label class="form-label">Значение</label><input type="text" name="payment_value" class="form-control" inputmode="decimal" value="0" required><small class="form-text text-muted">Для процентов - число (напр. 5), для зарплаты - сумма в тенге.</small></div>
         </div>
         <div class="modal-footer"><button type="submit" class="btn btn-primary">Сохранить</button></div>
       </form>
@@ -2106,7 +2103,7 @@ CASHIER_DASHBOARD_CONTENT = """
                     <td><small class="text-muted">{{ t.id[:8] }}</small></td>
                     <td>{{ t.timestamp[:16]|replace('T', ' ') }}</td>
                     <td><span class="badge bg-{{'primary' if t.type == 'sale' else 'warning'}}">{{'Продажа' if t.type == 'sale' else 'Возврат'}}</span></td>
-                    <td class="fw-bold">{{ format_currency_py(t.total_amount) }} с</td>
+                    <td class="fw-bold">{{ format_currency_py(t.total_amount) }} ₸</td>
                     <td><span class="badge bg-{{'success' if t.status == 'completed' else 'secondary'}}">{{t.status}}</span></td>
                     <td>
                         {% if t.type == 'sale' and t.status == 'completed' %}