diff --git a/.gitignore b/.gitignore index e427ff3..f874c48 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,12 @@ node_modules/ */node_modules/ */build/ +.env +db.sqlite3 +media/ +staticfiles/ +__pycache__/ +*.pyc +.DS_Store +*.log +tmp/ diff --git a/core/__pycache__/models.cpython-311.pyc b/core/__pycache__/models.cpython-311.pyc index f74068e..05112f9 100644 Binary files a/core/__pycache__/models.cpython-311.pyc and b/core/__pycache__/models.cpython-311.pyc differ diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc index 14d2920..43fa783 100644 Binary files a/core/__pycache__/views.cpython-311.pyc and b/core/__pycache__/views.cpython-311.pyc differ diff --git a/core/migrations/0036_alter_systemsetting_options.py b/core/migrations/0036_alter_systemsetting_options.py new file mode 100644 index 0000000..fac0542 --- /dev/null +++ b/core/migrations/0036_alter_systemsetting_options.py @@ -0,0 +1,17 @@ +# Generated by Django 5.2.7 on 2026-02-11 16:22 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0035_remove_heldsale_customer_remove_heldsale_notes_and_more'), + ] + + operations = [ + migrations.AlterModelOptions( + name='systemsetting', + options={'permissions': [('view_dashboard', 'Can view dashboard'), ('view_pos', 'Can access POS'), ('view_reports', 'Can view reports'), ('view_accounting', 'Can view accounting'), ('view_hr', 'Can view HR')]}, + ), + ] diff --git a/core/migrations/0037_alter_systemsetting_options.py b/core/migrations/0037_alter_systemsetting_options.py new file mode 100644 index 0000000..6b9329e --- /dev/null +++ b/core/migrations/0037_alter_systemsetting_options.py @@ -0,0 +1,17 @@ +# Generated by Django 5.2.7 on 2026-02-11 16:26 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0036_alter_systemsetting_options'), + ] + + operations = [ + migrations.AlterModelOptions( + name='systemsetting', + options={'permissions': [('view_dashboard', 'Can view dashboard'), ('view_pos', 'Can access POS'), ('view_reports', 'Can view reports'), ('view_accounting', 'Can view accounting'), ('view_hr', 'Can view HR'), ('view_inventory', 'Can view inventory'), ('view_sales', 'Can view sales'), ('view_purchases', 'Can view purchases'), ('view_customers', 'Can view customers'), ('view_suppliers', 'Can view suppliers'), ('view_expenses', 'Can view expenses'), ('view_lpo', 'Can view LPO'), ('view_quotations', 'Can view quotations')]}, + ), + ] diff --git a/core/models.py b/core/models.py index c9b2133..f8a7dc0 100644 --- a/core/models.py +++ b/core/models.py @@ -398,6 +398,21 @@ class SystemSetting(models.Model): favicon = models.FileField(_("Favicon"), upload_to="business_logos/", blank=True, null=True) vat_number = models.CharField(_("VAT Number"), max_length=50, blank=True) registration_number = models.CharField(_("Registration Number"), max_length=50, blank=True) + + # Loyalty Settings + loyalty_enabled = models.BooleanField(_("Enable Loyalty System"), default=False) + points_per_currency = models.DecimalField(_("Points Earned per Currency Unit"), max_digits=10, decimal_places=2, default=1.0) + currency_per_point = models.DecimalField(_("Currency Value per Point"), max_digits=10, decimal_places=3, default=0.01) + min_points_to_redeem = models.PositiveIntegerField(_("Minimum Points to Redeem"), default=100) + + # WhatsApp Gateway (Wablas) + wablas_enabled = models.BooleanField(_("Enable WhatsApp Gateway"), default=False) + wablas_server_url = models.URLField(_("Wablas Server URL"), blank=True, help_text=_("Example: https://console.wablas.com")) + wablas_token = models.CharField(_("Wablas API Token"), max_length=255, blank=True) + wablas_secret_key = models.CharField(_("Wablas Secret Key"), max_length=255, blank=True) + + # POS Settings + allow_zero_stock_sales = models.BooleanField(_("Allow selling items with 0 stock"), default=False) class Meta: permissions = [ @@ -406,6 +421,14 @@ class SystemSetting(models.Model): ("view_reports", "Can view reports"), ("view_accounting", "Can view accounting"), ("view_hr", "Can view HR"), + ("view_inventory", "Can view inventory"), + ("view_sales", "Can view sales"), + ("view_purchases", "Can view purchases"), + ("view_customers", "Can view customers"), + ("view_suppliers", "Can view suppliers"), + ("view_expenses", "Can view expenses"), + ("view_lpo", "Can view LPO"), + ("view_quotations", "Can view quotations"), ] def __str__(self): diff --git a/core/templates/base.html b/core/templates/base.html index 3313009..1939b64 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -64,11 +64,14 @@ @@ -99,11 +107,14 @@ @@ -134,6 +146,7 @@ @@ -155,6 +168,7 @@ @@ -175,21 +190,24 @@ - {% if user.is_superuser or user.is_staff %} - + {% if user.is_staff or perms.core.view_accounting %}
  • @@ -229,7 +247,9 @@
    • + {% endif %} + {% if user.is_staff or perms.core.view_hr %}
  • @@ -269,7 +289,9 @@
    • + {% endif %} + {% if user.is_staff or perms.core.view_reports %}
  • @@ -304,7 +326,9 @@
    • + {% endif %} + {% if user.is_staff %}
  • @@ -378,6 +402,17 @@
    + {% if messages %} +
    + {% for message in messages %} + + {% endfor %} +
    + {% endif %} +
    {% csrf_token %} @@ -478,6 +513,11 @@ document.addEventListener('submit', function (e) { const form = e.target; if (form.tagName === 'FORM') { + // Don't disable if it's the login form or has a specific class + if (form.action.includes('login') || form.classList.contains('no-disable')) { + return; + } + if (form.getAttribute('data-submitted') === 'true') { e.preventDefault(); return; @@ -486,7 +526,6 @@ const submitButtons = form.querySelectorAll('button[type="submit"], input[type="submit"]'); submitButtons.forEach(btn => { btn.disabled = true; - // Add spinner if it is a button and not already there if (btn.tagName === 'BUTTON' && !btn.querySelector('.spinner-border')) { const originalText = btn.innerHTML; btn.innerHTML = `${originalText}`; @@ -494,6 +533,32 @@ }); } }); + + // Cleanup stale modal backdrops and body classes aggressively + (function() { + function cleanupModals() { + const backdrops = document.querySelectorAll('.modal-backdrop'); + if (backdrops.length > 0) { + console.log('Cleaning up ' + backdrops.length + ' stale backdrops'); + backdrops.forEach(el => el.remove()); + } + document.body.classList.remove('modal-open'); + document.body.style.overflow = ''; + document.body.style.paddingRight = ''; + } + + // Run multiple times to ensure cleanup + cleanupModals(); + window.addEventListener('DOMContentLoaded', cleanupModals); + window.addEventListener('load', cleanupModals); + + // Periodically check for 2 seconds + let attempts = 0; + const interval = setInterval(() => { + cleanupModals(); + if (++attempts > 10) clearInterval(interval); + }, 500); + })(); {% block scripts %}{% endblock %} diff --git a/core/views.py b/core/views.py index 5b8f6e5..a641c24 100644 --- a/core/views.py +++ b/core/views.py @@ -391,6 +391,11 @@ def group_details_api(request, pk): @login_required def pos(request): + # Permission check + if not (request.user.is_staff or request.user.has_perm('core.view_pos')): + messages.error(request, _("You do not have permission to access the POS system.")) + return redirect('index') + # Check for active session active_session = CashierSession.objects.filter(user=request.user, status='active').first() if not active_session: @@ -2042,18 +2047,91 @@ def get_customer_loyalty_api(request, pk): @csrf_exempt @login_required def hold_sale_api(request): - return JsonResponse({'success': True}) + if request.method == 'POST': + try: + data = json.loads(request.body) + customer_name = "" + customer_id = data.get('customer_id') + if customer_id: + try: + customer = Customer.objects.get(id=customer_id) + customer_name = customer.name + except (Customer.DoesNotExist, ValueError): + pass + + # Store everything in cart_data JSON + cart_info = { + 'items': data.get('items', []), + 'customer_id': customer_id, + 'customer_name': customer_name + } + + HeldSale.objects.create( + created_by=request.user, + cart_data=json.dumps(cart_info), + customer_name=customer_name, + note=data.get('notes', "") + ) + return JsonResponse({'success': True}) + except Exception as e: + logger.error(f"Error holding sale: {str(e)}") + return JsonResponse({'success': False, 'error': str(e)}) + return JsonResponse({'success': False, 'error': 'Only POST allowed'}) @login_required def get_held_sales_api(request): - return JsonResponse({'sales': []}) + sales = HeldSale.objects.filter(created_by=request.user).order_by('-created_at') + sales_list = [] + for s in sales: + try: + cart_info = json.loads(s.cart_data) + item_count = len(cart_info.get('items', [])) + except: + item_count = 0 + + sales_list.append({ + 'id': s.id, + 'customer_name': s.customer_name or _("Walk-in Customer"), + 'note': s.note, + 'created_at': s.created_at.strftime('%Y-%m-%d %H:%M'), + 'item_count': item_count + }) + return JsonResponse({'success': True, 'held_sales': sales_list}) @login_required def recall_held_sale_api(request, pk): - return JsonResponse({'success': True}) + sale = get_object_or_404(HeldSale, pk=pk, created_by=request.user) + try: + cart_info = json.loads(sale.cart_data) + + # Support both old format (just items) and new format (dict with items, customer_id, etc) + if isinstance(cart_info, list): + items = cart_info + customer_id = "" + customer_name = sale.customer_name + else: + items = cart_info.get('items', []) + customer_id = cart_info.get('customer_id', "") + customer_name = cart_info.get('customer_name', sale.customer_name) + + data = { + 'success': True, + 'items': items, + 'customer_id': customer_id, + 'customer_name': customer_name, + } + + # Delete the held sale once recalled + sale.delete() + return JsonResponse(data) + except Exception as e: + logger.error(f"Error recalling sale: {str(e)}") + return JsonResponse({'success': False, 'error': str(e)}) @login_required def delete_held_sale_api(request, pk): + sale = get_object_or_404(HeldSale, pk=pk, created_by=request.user) + sale.delete() return JsonResponse({'success': True}) @login_required def backup_database(request):