diff --git a/assets/pasted-20260211-124352-68ac57b9.png b/assets/pasted-20260211-124352-68ac57b9.png new file mode 100644 index 0000000..3e2f865 Binary files /dev/null and b/assets/pasted-20260211-124352-68ac57b9.png differ diff --git a/assets/pasted-20260211-131304-152989f6.png b/assets/pasted-20260211-131304-152989f6.png new file mode 100644 index 0000000..3e2f865 Binary files /dev/null and b/assets/pasted-20260211-131304-152989f6.png differ diff --git a/config/__pycache__/wsgi.cpython-311.pyc b/config/__pycache__/wsgi.cpython-311.pyc index 3595d64..cc90925 100644 Binary files a/config/__pycache__/wsgi.cpython-311.pyc and b/config/__pycache__/wsgi.cpython-311.pyc differ diff --git a/config/wsgi.py b/config/wsgi.py index 0b34d00..28f3157 100644 --- a/config/wsgi.py +++ b/config/wsgi.py @@ -21,34 +21,55 @@ except ImportError: pass # --- FIX: Preload libraries for WeasyPrint/Pango --- -# Ensure LD_LIBRARY_PATH includes standard paths -if 'LD_LIBRARY_PATH' not in os.environ: - os.environ['LD_LIBRARY_PATH'] = '/usr/lib/x86_64-linux-gnu:/usr/lib' -else: - if '/usr/lib/x86_64-linux-gnu' not in os.environ['LD_LIBRARY_PATH']: - os.environ['LD_LIBRARY_PATH'] += ':/usr/lib/x86_64-linux-gnu' +# Manually load libraries using absolute paths +import ctypes +import ctypes.util +import traceback +import sys -# Manually load the library +lib_paths = [ + '/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0', + '/usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0', + '/usr/lib/x86_64-linux-gnu/libfontconfig.so.1', + '/usr/lib/x86_64-linux-gnu/libcairo.so.2', + '/usr/lib/x86_64-linux-gnu/libpango-1.0.so.0', + '/usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0', +] + +for path in lib_paths: + try: + ctypes.CDLL(path) + except OSError: + pass + +# Try to import weasyprint try: - if not ctypes.util.find_library('libgobject-2.0-0'): - # Try to load known paths directly - candidates = [ - 'libgobject-2.0.so.0', - '/usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0', - '/usr/lib/libgobject-2.0.so.0' - ] - for c in candidates: - try: - ctypes.CDLL(c) - break - except OSError: - continue -except Exception: - pass -# --------------------------------------------------- + import weasyprint +except Exception as e: + # Log error to file and stderr + error_msg = f"WeasyPrint Import Error: {str(e)}\n{traceback.format_exc()}" + sys.stderr.write(error_msg) + try: + with open("weasyprint_wsgi_error.log", "w") as f: + f.write(error_msg) + except Exception: + pass -from django.core.wsgi import get_wsgi_application + # Fallback to mock + import types + class MockHTML: + def __init__(self, string=None, base_url=None): + pass + def write_pdf(self, target=None): + raise OSError("WeasyPrint system dependencies are missing. PDF generation is disabled.") + + mock_wp = types.ModuleType("weasyprint") + mock_wp.HTML = MockHTML + sys.modules["weasyprint"] = mock_wp +# --------------------------------------------------- os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings') +from django.core.wsgi import get_wsgi_application + application = get_wsgi_application() \ No newline at end of file diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc index 47ba767..14d2920 100644 Binary files a/core/__pycache__/views.cpython-311.pyc and b/core/__pycache__/views.cpython-311.pyc differ diff --git a/core/templates/core/cashier_registry.html b/core/templates/core/cashier_registry.html index d32758f..a9c3958 100644 --- a/core/templates/core/cashier_registry.html +++ b/core/templates/core/cashier_registry.html @@ -25,7 +25,7 @@ + +
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+ + + + {% endfor %} @@ -89,7 +126,7 @@
- +
@@ -130,7 +167,7 @@ if (data.success) { if (stayOpen) { document.getElementById('addCustName').value = ''; - document.getElementById('addCustPhone').value = ''; + document.getElementById('addCustPhone').value = '968'; document.getElementById('addCustEmail').value = ''; document.getElementById('addCustAddress').value = ''; alert('{% trans "Customer added. You can add another one." %}'); diff --git a/core/templates/core/suppliers.html b/core/templates/core/suppliers.html index 2e2753c..7b078b6 100644 --- a/core/templates/core/suppliers.html +++ b/core/templates/core/suppliers.html @@ -126,7 +126,7 @@
- +
@@ -159,7 +159,7 @@ if (stayOpen) { document.getElementById('addSuppName').value = ''; document.getElementById('addSuppContact').value = ''; - document.getElementById('addSuppPhone').value = ''; + document.getElementById('addSuppPhone').value = '968'; alert('{% trans "Supplier added. You can add another one." %}'); } else { window.location.reload(); diff --git a/core/views.py b/core/views.py index af7e9bb..5b8f6e5 100644 --- a/core/views.py +++ b/core/views.py @@ -1265,6 +1265,8 @@ def edit_customer(request, pk): if request.method == 'POST': customer.name = request.POST.get('name') customer.phone = request.POST.get('phone') + customer.email = request.POST.get('email') + customer.address = request.POST.get('address') customer.save() return redirect('customers') @@ -1640,8 +1642,16 @@ def create_lpo_api(request): # --- Cashier / Sessions --- @login_required def cashier_registry(request): - registries = CashierCounterRegistry.objects.all() - return render(request, 'core/cashier_registry.html', {'registries': registries}) + registries = CashierCounterRegistry.objects.select_related('user', 'counter').all() + # Provide data for dropdowns + users = User.objects.filter(is_active=True).order_by('username') + counters = Device.objects.all().order_by('name') + + return render(request, 'core/cashier_registry.html', { + 'registries': registries, + 'users': users, + 'counters': counters + }) @login_required def cashier_session_list(request): diff --git a/manage.py b/manage.py index 8fc5750..fcd4440 100755 --- a/manage.py +++ b/manage.py @@ -15,34 +15,52 @@ def main(): pass # --- FIX: Preload libraries for WeasyPrint/Pango --- - # This fixes OSError: cannot load library 'libgobject-2.0-0' during deployment - import ctypes.util + # Manually load libraries using absolute paths since LD_LIBRARY_PATH + # changes don't affect dlopen() in the running process. import ctypes + import ctypes.util + import traceback - # 1. Ensure LD_LIBRARY_PATH includes standard paths (helper for find_library) - if 'LD_LIBRARY_PATH' not in os.environ: - os.environ['LD_LIBRARY_PATH'] = '/usr/lib/x86_64-linux-gnu:/usr/lib' - else: - if '/usr/lib/x86_64-linux-gnu' not in os.environ['LD_LIBRARY_PATH']: - os.environ['LD_LIBRARY_PATH'] += ':/usr/lib/x86_64-linux-gnu' + lib_paths = [ + '/usr/lib/x86_64-linux-gnu/libglib-2.0.so.0', + '/usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0', + '/usr/lib/x86_64-linux-gnu/libfontconfig.so.1', + '/usr/lib/x86_64-linux-gnu/libcairo.so.2', + '/usr/lib/x86_64-linux-gnu/libpango-1.0.so.0', + '/usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0', + ] - # 2. Manually load the library to ensure it's available + for path in lib_paths: + try: + ctypes.CDLL(path) + except OSError: + # Continue even if one fails + pass + + # Try to import weasyprint to see if it works try: - if not ctypes.util.find_library('libgobject-2.0-0'): - # Try to load known paths directly - candidates = [ - 'libgobject-2.0.so.0', - '/usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0', - '/usr/lib/libgobject-2.0.so.0' - ] - for c in candidates: - try: - ctypes.CDLL(c) - break - except OSError: - continue - except Exception: - pass + import weasyprint + except Exception as e: + # Log the specific error for debugging + error_msg = f"WeasyPrint Import Error: {str(e)}\n{traceback.format_exc()}" + sys.stderr.write(error_msg) + try: + with open("weasyprint_error.log", "w") as f: + f.write(error_msg) + except Exception: + pass + + # Fallback to mock if system dependencies are missing or import fails + import types + class MockHTML: + def __init__(self, string=None, base_url=None): + pass + def write_pdf(self, target=None): + raise OSError("WeasyPrint system dependencies are missing. PDF generation is disabled.") + + mock_wp = types.ModuleType("weasyprint") + mock_wp.HTML = MockHTML + sys.modules["weasyprint"] = mock_wp # --------------------------------------------------- os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings') @@ -57,4 +75,4 @@ def main(): execute_from_command_line(sys.argv) if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/staticfiles/pasted-20260211-124352-68ac57b9.png b/staticfiles/pasted-20260211-124352-68ac57b9.png new file mode 100644 index 0000000..3e2f865 Binary files /dev/null and b/staticfiles/pasted-20260211-124352-68ac57b9.png differ diff --git a/staticfiles/pasted-20260211-131304-152989f6.png b/staticfiles/pasted-20260211-131304-152989f6.png new file mode 100644 index 0000000..3e2f865 Binary files /dev/null and b/staticfiles/pasted-20260211-131304-152989f6.png differ