diff --git a/inventory/views.py b/inventory/views.py index 434a540b..03f16f99 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -6762,27 +6762,37 @@ def send_lead_email(request, dealer_slug, slug, email_pk=None): # return response # return redirect("lead_list", dealer_slug=dealer_slug) msg = f""" - السلام عليكم - Dear {lead.full_name}, +السلام عليكم {lead.full_name}, - أود أن أشارككم تقدير المشروع الذي ناقشناه. يرجى العثور على الوثيقة التفصيلية للمقترح المرفقة. +شكراً لزيارتك لـ {lead.dealer.name}! لقد كان من دواعي سرورنا مساعدتك اليوم. - I hope this email finds you well. I wanted to share with you the estimate for the project we discussed. Please find the detailed estimate document attached. +لقد أنشأنا ملفاً شخصياً لك في نظامنا لتتبع تفضيلاتك والسيارات التي تهتم بها. سنتواصل معك قريباً للمتابعة والإجابة على أي أسئلة أخرى قد تكون لديك. - يرجى مراجعة المقترح وإعلامي إذا كانت لديك أي أسئلة أو مخاوف. إذا كانت كل شيء يبدو جيدًا، يمكننا المضي قدمًا في المشروع. +في هذه الأثناء، لا تتردد في الاتصال بنا مباشرة على {lead.dealer.phone_number} أو زيارتنا مرة أخرى في أي وقت يناسبك. - Please review the estimate and let me know if you have any questions or concerns. If everything looks good, we can proceed with the project. +نتطلع إلى مساعدتك في العثور على سيارتك القادمة! - شكراً لاهتمامكم بهذا الأمر. - Thank you for your attention to this matter. +تحياتي، +{lead.dealer.arabic_name} +{lead.dealer.address} +{lead.dealer.phone_number} +----- +Dear {lead.full_name}, - تحياتي, - Best regards, - [Your Name] - [Your Position] - [Your Company] - [Your Contact Information] - """ +Thank you for visiting {lead.dealer.name}! It was a pleasure to assist you today. + +We've created a profile for you in our system to keep track of your preferences and the vehicles you're interested in. We'll be in touch shortly to follow up and answer any further questions you may have. + +In the meantime, feel free to contact us directly at {lead.dealer.phone_number} or visit us again at your convenience. + +We look forward to helping you find your next car! + +Best regards, +{lead.dealer.name} +{lead.dealer.address} +{lead.dealer.phone_number} + +""" subject = "" if email_pk: email = get_object_or_404(models.Email, pk=email_pk) @@ -7034,17 +7044,11 @@ class OpportunityListView(LoginRequiredMixin, PermissionRequiredMixin, ListView) staff = self.request.staff queryset = models.Opportunity.objects.filter(dealer=dealer, lead__staff=staff) - # Search filter - search = self.request.GET.get("q") - if search: - queryset = queryset.filter( - Q(customer__first_name__icontains=search) - | Q(customer__last_name__icontains=search) - | Q(customer__email__icontains=search) - ) + # Stage filter stage = self.request.GET.get("stage") + print(stage) if stage: queryset = queryset.filter(stage=stage) @@ -7055,7 +7059,16 @@ class OpportunityListView(LoginRequiredMixin, PermissionRequiredMixin, ListView) elif sort == "highest": queryset = queryset.order_by("-expected_revenue") elif sort == "closing": - queryset = queryset.order_by("closing_date") + queryset = queryset.order_by("expected_close_date") + + # Search filter + search = self.request.GET.get("q") + if search: + queryset = queryset.filter( + Q(customer__first_name__icontains=search) + | Q(customer__last_name__icontains=search) + | Q(customer__email__icontains=search) + ) return queryset @@ -7799,27 +7812,44 @@ def send_email_view(request, dealer_slug, pk): ) msg = f""" - السلام عليكم - Dear {estimate.customer.customer_name}, +السلام عليكم، - أود أن أشارككم عرض السعر. +عزيزي {estimate.customer.customer_name}، - I wanted to share with you the quotation. +يسعدني أن أشارككم عرض السعر الذي طلبتموه. يرجى الاطلاع على التفاصيل الكاملة والأسعار من خلال الرابط أدناه. - يرجى مراجعة عرض السعر وإعلامي إذا كانت لديك أي استفسارات أو ملاحظات. إذا كان كل شيء على ما يرام، يمكننا المتابعة في الإجراءات. +حرصنا على أن يكون عرضنا مناسباً وشفافاً. إذا كانت لديكم أي استفسارات أو ملاحظات، فلا تترددوا في التواصل معنا. - Please review the quotation and let me know if you have any questions or concerns. If everything looks good, we can proceed with the process. +رابط عرض السعر: +{link} - رابط عرض السعر: - {link} +نأمل أن ينال العرض إعجابكم ونتطلع إلى بدء العمل قريباً! +تحياتي، - تحياتي, - Best regards, - {dealer.get_local_name} - {dealer.phone_number} - هيكل | Haikal - """ +{dealer.get_local_name} +{dealer.phone_number} +Haikal | هيكل +----- +Dear {estimate.customer.customer_name}, + +I hope this email finds you well. + +Following up on our conversation, I'm excited to share the quotation for your review. Please find the detailed pricing and information by clicking on the link below. + +We've done our best to provide you with a fair and competitive offer. If you have any questions or would like to discuss it further, please don't hesitate to reach out. + +Quotation Link: +{link} + +We look forward to hearing from you and hopefully moving forward with your project! + +Best regards, + +{dealer.get_local_name} +{dealer.phone_number} +Haikal +""" # subject = _("Quotation") send_email( @@ -10687,13 +10717,69 @@ def purchase_report_csv_export(request,dealer_slug): ]) return response +# @login_required +# def car_sale_report_view(request,dealer_slug): +# dealer = get_object_or_404(models.Dealer, slug=dealer_slug) +# cars_sold = models.Car.objects.filter(dealer=dealer,status='sold') +# current_time = timezone.now().strftime("%Y-%m-%d %H:%M:%S") +# context={'cars_sold':cars_sold,'current_time':current_time } +# return render(request,'ledger/reports/car_sale_report.html',context) + + @login_required -def car_sale_report_view(request,dealer_slug): - dealer = get_object_or_404(models.Dealer, slug=dealer_slug) - cars_sold = models.Car.objects.filter(dealer=dealer,status='sold') - current_time = timezone.now().strftime("%Y-%m-%d %H:%M:%S") - context={'cars_sold':cars_sold,'current_time':current_time } - return render(request,'ledger/reports/car_sale_report.html',context) +def car_sale_report_view(request, dealer_slug): + dealer = get_object_or_404(models.Dealer, slug=dealer_slug) + cars_sold = models.Car.objects.filter(dealer=dealer, status='sold') + + # Get filter parameters from the request + selected_make = request.GET.get('make') + selected_model = request.GET.get('model') + selected_serie = request.GET.get('serie') + selected_year = request.GET.get('year') + + # Apply filters to the queryset + if selected_make: + cars_sold = cars_sold.filter(id_car_make__name=selected_make) + if selected_model: + cars_sold = cars_sold.filter(id_car_model__name=selected_model) + if selected_serie: + cars_sold = cars_sold.filter(id_car_serie__name=selected_serie) + if selected_year: + cars_sold = cars_sold.filter(year=selected_year) + + # Get distinct values for filter dropdowns + makes = models.Car.objects.filter(dealer=dealer, status='sold').values_list('id_car_make__name', flat=True).distinct() + models_qs = models.Car.objects.filter(dealer=dealer, status='sold').values_list('id_car_model__name', flat=True).distinct() + series = models.Car.objects.filter(dealer=dealer, status='sold').values_list('id_car_serie__name', flat=True).distinct() + years = models.Car.objects.filter(dealer=dealer, status='sold').values_list('year', flat=True).distinct().order_by('-year') + + # # Calculate summary data for the filtered results + + total_revenue = cars_sold.aggregate(total_revenue=Sum('finances__marked_price'))['total_revenue'] or 0 + # total_vat = cars_sold.aggregate(total_vat=Sum('finances__vat_amount'))['total_vat'] or 0 + total_discount = cars_sold.aggregate(total_discount=Sum('finances__discount_amount'))['total_discount'] or 0 + + current_time = timezone.now().strftime("%Y-%m-%d %H:%M:%S") + + context = { + 'cars_sold': cars_sold, + 'current_time': current_time, + 'dealer': dealer, + 'total_revenue': total_revenue, + # 'total_vat': total_vat, + 'total_discount': total_discount, + 'makes': makes, + 'models': models_qs, + 'series': series, + 'years': years, + 'selected_make': selected_make, + 'selected_model': selected_model, + 'selected_serie': selected_serie, + 'selected_year': selected_year, + } + + return render(request, 'ledger/reports/car_sale_report.html', context) + def car_sale_report_csv_export(request,dealer_slug): @@ -10737,10 +10823,10 @@ def car_sale_report_csv_export(request,dealer_slug): car.year, car.id_car_serie.name, car.id_car_trim.name, - car.mileage, + car.mileage if car.mileage else '0', car.stock_type, car.created_at.strftime("%Y-%m-%d %H:%M:%S") if car.created_at else '', - car.sold_date.strftime("%Y-%m-%d %H:%M:%S") if car.created_at else '', + car.sold_date.strftime("%Y-%m-%d %H:%M:%S") if car.sold_date else '', car.finances.cost_price, car.finances.marked_price, car.finances.discount_amount, diff --git a/templates/admin_management/management.html b/templates/admin_management/management.html index d79103e3..efd75f84 100644 --- a/templates/admin_management/management.html +++ b/templates/admin_management/management.html @@ -3,6 +3,7 @@ {% block title %} {% trans 'Admin Management' %} {% endblock %} {% block content %} +

{% trans "Admin Management" %}

  • diff --git a/templates/base.html b/templates/base.html index 5c3cf542..3e1e03c5 100644 --- a/templates/base.html +++ b/templates/base.html @@ -84,7 +84,7 @@ {% include "plans/expiration_messages.html" %} {% block period_navigation %} {% endblock period_navigation %} -
    +
    diff --git a/templates/crm/notifications_history.html b/templates/crm/notifications_history.html index 764226ae..98649969 100644 --- a/templates/crm/notifications_history.html +++ b/templates/crm/notifications_history.html @@ -30,19 +30,11 @@ {% endfor %}
    -     + {% if page_obj.paginator.num_pages > 1 %} +
    +
    {% include 'partials/pagination.html' %}
    +
    + {% endif %} {% else %}

    No notifications found.

    {% endif %} diff --git a/templates/crm/opportunities/opportunity_list.html b/templates/crm/opportunities/opportunity_list.html index c1f17a56..65c45ab2 100644 --- a/templates/crm/opportunities/opportunity_list.html +++ b/templates/crm/opportunities/opportunity_list.html @@ -5,13 +5,28 @@ {{ _("Opportunities") }} {% endblock title %} {% block content %} + {% if opportunities or request.GET.q%}
    -
    -

    - {{ _("Opportunities") }} -
  • -

    +
    +
    +
    +

    + {{ _("Opportunities") }} +
  • +

    +
    +
    +
    + {% if perms.inventory.add_opportunity %} +
    + + {{ _("Add Opportunity") }} + +
    + {% endif %} +
    @@ -19,29 +34,38 @@
    -
    -
    - - - {% if request.GET.q %} - - {% endif %} -
    +
    +
    + + + + + + {% if request.GET.q %} + + {% endif %} + +
    +
    + +
    + + {% for make in makes %} + + {% endfor %} +
    -
    -
    -
    -
    {% trans 'Total Vat Amount' %}
    -

    12000

    -
    -
    +
    + +
    -
    -
    -
    -
    {% trans 'Total Discount Amount' %}
    -

    12000

    -
    -
    +
    + +
    - - - -
    - +
    + + +
    +
    + +
    + -
    -

    {% trans 'Detailed Purchase List' %}

    - -
    - - {% trans 'Download as CSV' %} - +
    +

    {% trans 'Report Summary' %}

    +
    +
    +
    +
    +
    {% trans 'Total Revenue' %}
    +

    {{ total_revenue|floatformat:2 }}

    +
    +
    +
    +
    +
    +
    +
    {% trans 'Total VAT Amount' %}
    +

    {{ total_vat|floatformat:2 }}

    +
    +
    +
    +
    +
    +
    +
    {% trans 'Total Discount Amount' %}
    +

    {{ total_discount|floatformat:2 }}

    +
    +
    +
    +
    +
    +
    +
    {% trans 'Total Cars Sold' %}
    +

    {{ cars_sold|length }}

    +
    +
    +
    -
    - - + + +
    +

    {% trans 'Detailed Sale List' %}

    +
    + + {% trans 'Download as CSV' %} + +
    +
    +
    + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - {% for car in cars_sold%} + {% for car in cars_sold %} - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + {% endfor %} @@ -108,4 +187,4 @@ -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/templates/ledger/reports/purchase_report.html b/templates/ledger/reports/purchase_report.html index e72b97e2..4edd5abc 100644 --- a/templates/ledger/reports/purchase_report.html +++ b/templates/ledger/reports/purchase_report.html @@ -8,73 +8,114 @@ {% block content%} + +
    -

    {% trans 'Car Purchase Report' %}

    +

    {% trans 'Car Purchase Report' %}

    {{dealer}}

    -

    Report Date: {{current_time}}

    +

    {% trans "Report Date" %}: {{current_time}}

    -
    -

    {% trans 'Report Summary' %}

    -
    -
    +
    +

    {% trans 'Report Summary' %}

    +
    +
    -
    {% trans 'Total Purchase Amount' %}
    -

    {{total_po_amount}}

    +
    {% trans 'Total Purchase Amount' %}
    +

    {{total_po_amount}}

    -
    +
    -
    {% trans 'Total Cars Purchased' %}
    -

    {{total_po_cars}}

    +
    {% trans 'Total Cars Purchased' %}
    +

    {{total_po_cars}}

    +
    +
    +
    +
    +
    +
    +
    {% trans 'Total Purchase Orders' %}
    +

    {{data|length}}

    - - -
    -
    -

    {% trans 'Detailed Purchase List' %}

    +

    {% trans 'Detailed Purchase List' %}

    - {% trans 'Download as CSV' %} - + {% trans 'Download as CSV' %} +
    -
    {% trans 'VIN' %}{% trans 'Make' %}{% trans 'Model' %}{% trans 'Year' %}{% trans 'Serie' %}{% trans 'Trim' %}{% trans 'Mileage' %}{% trans 'Stock Type' %}{% trans 'Created Date' %}{% trans 'Sold Date' %}{% trans 'Cost Price' %}{% trans 'Marked Price' %}{% trans 'Discount Amount' %}{% trans 'Selling Price' %}{% trans 'Tax Amount' %}{% trans 'Invoice Number' %}{% trans 'VIN' %}{% trans 'Make' %}{% trans 'Model' %}{% trans 'Year' %}{% trans 'Serie' %}{% trans 'Trim' %}{% trans 'Mileage' %}{% trans 'Stock Type' %}{% trans 'Created Date' %}{% trans 'Sold Date' %}{% trans 'Cost Price' %}{% trans 'Marked Price' %}{% trans 'Discount Amount' %}{% trans 'Selling Price' %}{% trans 'Tax Amount' %}{% trans 'Invoice Number' %}
    {{car.vin}}{{car.id_car_make.name}}{{car.id_car_model.name}}{{car.year}}{{car.id_car_serie.name}}{{car.id_car_trim.name}}{{car.mileage}}{{car.stock_type}}{{car.created_at}}{{car.sold_date}}{{car.finances.cost_price}}{{car.finances.marked_price}}{{car.finances.discount_amount}}{{car.finances.selling_price}}{{car.finances.vat_amount}}{{car.item_model.invoicemodel_set.first.invoice_number}}{{ car.vin }}{{ car.id_car_make.name }}{{ car.id_car_model.name }}{{ car.year }}{{ car.id_car_serie.name }}{{ car.id_car_trim.name }}{{ car.mileage }}{{ car.stock_type }}{{ car.created_at }}{{ car.sold_date }}{{ car.finances.cost_price }}{{ car.finances.marked_price }}{{ car.finances.discount_amount }}{{ car.finances.selling_price }}{{ car.finances.vat_amount }}{{ car.item_model.invoicemodel_set.first.invoice_number }}
    - +
    + - - - - - - - - + + + + + + + + - {% for po in data %} - + - - + + {% endfor %} - - - - - -
    {% trans 'Purchase ID' %}{% trans 'Date Created' %}{% trans 'Status' %}{% trans 'PO Amount' %}{% trans 'Date Fulfilled' %}{% trans 'Created By' %}{% trans 'Cars Purchased' %}{% trans 'Vendor' %}{% trans 'Purchase ID' %}{% trans 'Date Created' %}{% trans 'Status' %}{% trans 'PO Amount' %}{% trans 'Date Fulfilled' %}{% trans 'Created By' %}{% trans 'Cars Purchased' %}{% trans 'Vendor' %}
    {{po.po_number}}{{po.po_number}} {{po.po_created|date}} {{po.po_status}} {{po.po_amount}}{{po.po_fulfilled_date}}staff + {% if po.po_fulfilled_date%} + {{po.po_fulfilled_date}} + {%else%} + {% trans 'Not fulfilled'%} + {% endif %} + {% firstof po.created_by.get_full_name 'staff' %} {{po.po_quantity}} {{po.vendors_str}} @@ -82,16 +123,10 @@
    {% trans 'Total Purchase'%}:{{total_po_amount}}
    -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/templates/mail/change_plan_body.txt b/templates/mail/change_plan_body.txt index 489b5100..bcd93981 100644 --- a/templates/mail/change_plan_body.txt +++ b/templates/mail/change_plan_body.txt @@ -1,13 +1,25 @@ {% load i18n %}{% autoescape off %} -{% trans "Hi" %} {% firstof user.get_full_name user.username %}, + +مرحباً {% firstof user.get_full_name user.username %}، {% if userplan.expire != None %} - {% blocktrans with plan_name=plan.name expire=userplan.expire %}Your current plan is {{ plan_name }} and it will expire on {{ expire }}. {% endblocktrans %} +خطتك الحالية هي {{ plan.name }} وستنتهي صلاحيتها في {{ userplan.expire }}. {% else %} - {% blocktrans with plan_name=plan.name %}Your current plan is {{ plan_name }}. {% endblocktrans %} +خطتك الحالية هي {{ plan.name }}. {% endif %} -{% trans "Thank you" %} --- -{% blocktrans %}The Team at {{ site_name }}{% endblocktrans %} -{% endautoescape %} +شكراً لك، +فريق تنحل +--------------------- + +Hi {% firstof user.get_full_name user.username %}, + +{% if userplan.expire != None %} +Your current plan is {{ plan_name }} and it will expire on {{ expire }}. {% endblocktrans %} +{% else %} +Your current plan is {{ plan_name }}. {% endblocktrans %} +{% endif %} + +Thank you +The Team at Tenhal +{% endautoescape %} \ No newline at end of file diff --git a/templates/mail/change_plan_title.txt b/templates/mail/change_plan_title.txt index bbec277e..a4a303c2 100644 --- a/templates/mail/change_plan_title.txt +++ b/templates/mail/change_plan_title.txt @@ -1 +1,3 @@ -{% load i18n %}{% blocktrans with user=user plan=plan.name %}Your account {{ user }} has new plan {{ plan }}{% endblocktrans %} \ No newline at end of file +{% load i18n %} +Your account {{ user }} has new plan {{ plan }} +حسابك {{ user }} لديه خطة جديدة {{ plan }} \ No newline at end of file diff --git a/templates/mail/expired_account_body.txt b/templates/mail/expired_account_body.txt index 701ad8f9..9355474a 100644 --- a/templates/mail/expired_account_body.txt +++ b/templates/mail/expired_account_body.txt @@ -1,14 +1,27 @@ {% load i18n %}{% autoescape off %} -{% trans "Hi" %} {% firstof user.get_full_name user.username %}, +مرحباً {% firstof user.get_full_name user.username %}، -{% blocktrans %}Your account has just expired.{% endblocktrans %} +لقد انتهت صلاحية حسابك للتو. -{% blocktrans with plan_name=userplan.plan.name %}You can restore your current plan {{ plan_name }} here:{% endblocktrans %} +يمكنك استعادة خطتك الحالية {{ userplan.plan.name }} من هنا: http://{{ site_domain }}{% url 'current_plan' %} -{% blocktrans %}or you can upgrade your plan here:{% endblocktrans %} +أو يمكنك ترقية خطتك من هنا: http://{{ site_domain }}{% url 'upgrade_plan' %} -{% trans "Thank you" %} +شكراً لك، -- -{% blocktrans %}The Team at {{ site_name }}{% endblocktrans %} -{% endautoescape %} +فريق تنحل +--------------------- +Hi {% firstof user.get_full_name user.username %}, + +Your account has just expired. + +You can restore your current plan {{ userplan.plan.name }} here: +http://{{ site_domain }}{% url 'current_plan' %} +or you can upgrade your plan here: +http://{{ site_domain }}{% url 'upgrade_plan' %} + +Thank you, +-- +The Team at TENHAL +{% endautoescape %} \ No newline at end of file diff --git a/templates/mail/expired_account_title.txt b/templates/mail/expired_account_title.txt index 54a3d3a7..e4b758bc 100644 --- a/templates/mail/expired_account_title.txt +++ b/templates/mail/expired_account_title.txt @@ -1 +1,5 @@ -{% load i18n %}{% blocktrans %}Your account {{ user }} has just expired{% endblocktrans %} \ No newline at end of file +{% load i18n %}{% autoescape off %} +لقد انتهت صلاحية حسابك {{ user }} للتو. +--------------------- +Your account {{ user }} has just expired. +{% endautoescape %} \ No newline at end of file diff --git a/templates/mail/extend_account_body.txt b/templates/mail/extend_account_body.txt index f7e77e50..ed64cb6a 100644 --- a/templates/mail/extend_account_body.txt +++ b/templates/mail/extend_account_body.txt @@ -1,11 +1,20 @@ {% load i18n %}{% autoescape off %} -{% trans "Hi" %} {% firstof user.get_full_name user.username %}, +مرحباً {% firstof user.get_full_name user.username %}، -{% blocktrans with days=pricing.period plan_name=plan.name expire=userplan.expire %}Your account has just been extended by {{ days }} days. Your current plan is {{ plan_name }} and it will expire on {{ expire }}. {% endblocktrans %} +تم تمديد صلاحية حسابك للتو لمدة {{ pricing.period }} يوم. خطتك الحالية هي {{plan.name}} وستنتهي في {{userplan.expire}}. -{% trans "An invoice will be sent with another e-mail, if billing data was provided." %} - -{% trans "Thank you" %} +سيتم إرسال فاتورة في رسالة بريد إلكتروني أخرى، في حال تم تقديم بيانات الفوترة. +شكراً لك -- -{% blocktrans %}The Team at {{ site_name }}{% endblocktrans %} -{% endautoescape %} +فريق تنحل +--------------------- +Hi {% firstof user.get_full_name user.username %}, + +Your account has just been extended by {{ pricing.period }} days. Your current plan is {{plan.name}} and it will expire on {{userplan.expire}}. + +An invoice will be sent with another e-mail, if billing data was provided. + +Thank you +-- +The Team at Tenhal +{% endautoescape %} \ No newline at end of file diff --git a/templates/mail/extend_account_title.txt b/templates/mail/extend_account_title.txt index 8a984a5e..2f66c163 100644 --- a/templates/mail/extend_account_title.txt +++ b/templates/mail/extend_account_title.txt @@ -1 +1,14 @@ -{% load i18n %}{% blocktrans with user=user days=pricing.period %}Your account {{ user }} has been extended by {{ days }} days{% endblocktrans %} \ No newline at end of file +{% load i18n %} +{% autoescape off %} +مرحباً {% firstof user.get_full_name user.username %}، +تم تمديد حسابك {{ user }} لمدة {{ pricing.period }} يوم +شكراً لك +-- +فريق تنحل +-------- +Hi {% firstof user.get_full_name user.username %}, +Your account {{ user }} has been extended by {{ pricing.period }} days +Thank you +-- +The Team at Tenhal +{% endautoescape %} \ No newline at end of file diff --git a/templates/mail/invoice_created_body.txt b/templates/mail/invoice_created_body.txt index 4367230c..7df530ad 100644 --- a/templates/mail/invoice_created_body.txt +++ b/templates/mail/invoice_created_body.txt @@ -1,14 +1,21 @@ {% load i18n %}{% autoescape off %} -{% trans "Hi" %} {% firstof user.get_full_name user.username %}, - -{% blocktrans %}We are writing to inform you, that {{ invoice_type }} {{ invoice_number }} has been issued. You can view it and print it at: +مرحباً {% firstof user.get_full_name user.username %}، +نكتب إليك لإعلامك، أنه قد تم إصدار {{ invoice_type }} رقم {{ invoice_number }}. يمكنك الاطلاع عليها وطباعتها عبر الرابط: http://{{ site_domain }}{{ url }} -{% endblocktrans %} - -{% trans "Details of the order can be see on:" %}: +يمكنك الاطلاع على تفاصيل الطلب عبر الرابط: http://{{ site_domain }}{% url 'order' pk=order %} -{% trans "Thank you" %} +شكراً لك -- -{% blocktrans %}The Team at {{ site_name }}{% endblocktrans %} -{% endautoescape %} +فريق تنحل +--------------------- +Hi {% firstof user.get_full_name user.username %}, +We are writing to inform you, that {{ invoice_type }} {{ invoice_number }} has been issued. You can view it and print it at: +http://{{ site_domain }}{{ url }} +Details of the order can be see on: +http://{{ site_domain }}{% url 'order' pk=order %} + +Thank you +-- +The Team at Tenhal +{% endautoescape %} \ No newline at end of file diff --git a/templates/mail/invoice_created_title.txt b/templates/mail/invoice_created_title.txt index 3304e800..eaec9b08 100644 --- a/templates/mail/invoice_created_title.txt +++ b/templates/mail/invoice_created_title.txt @@ -1 +1,3 @@ -{% load i18n %}{% trans 'Order' %} {{ order }} - {% blocktrans with invoice_type=invoice_type invoice_number=invoice_number user=user %}{{ invoice_type }} {{ invoice_number }} has been issued for {{ user }}{% endblocktrans %} \ No newline at end of file +{% load i18n %} +Order {{ order }} - {{ invoice_type }} {{ invoice_number }} has been issued for {{ user }} +تم إصدار {{ invoice_type }} {{ invoice_number }} للأمر {{ order }} باسم {{ user }} diff --git a/templates/mail/remind_expire_body.txt b/templates/mail/remind_expire_body.txt index e795fcdf..3ec99320 100644 --- a/templates/mail/remind_expire_body.txt +++ b/templates/mail/remind_expire_body.txt @@ -1,15 +1,29 @@ {% load i18n %}{% autoescape off %} -{% trans "Hi" %} {% firstof user.get_full_name user.username %}, +Hi {% firstof user.get_full_name user.username %}, -{% blocktrans %}Your account will expire in {{ days }} days.{% endblocktrans %} +Your account will expire in {{ days }} days. -{% blocktrans with plan_name=userplan.plan.name %}You can extend your current plan {{ plan_name }} on page:{% endblocktrans %} +You can extend your current plan {{ userplan.plan.name }} on page: http://{{ site_domain }}{% url 'current_plan' %} -{% blocktrans %}or you can upgrade your plan here:{% endblocktrans %} +or you can upgrade your plan here: http://{{ site_domain }}{% url 'upgrade_plan' %} -{% trans "Thank you" %} +Thank you -- -{% blocktrans %}The Team at {{ site_name }}{% endblocktrans %} +The Team at Tenhal +---------------- +مرحباً {% firstof full_name username %}، + +سينتهي حسابك في غضون {{ days }} يوم. + +يمكنك تمديد خطتك الحالية {{ userplan.plan.name }} على الصفحة التالية: +http://{{ site_domain }}{% url 'current_plan' %} + +أو يمكنك ترقية خطتك هنا: +http://{{ site_domain }}{% url 'upgrade_plan' %} + +شكراً لك +-- +فريق تنحل {% endautoescape %} diff --git a/templates/mail/remind_expire_title.txt b/templates/mail/remind_expire_title.txt index b6863e01..01885ad3 100644 --- a/templates/mail/remind_expire_title.txt +++ b/templates/mail/remind_expire_title.txt @@ -1 +1,3 @@ -{% load i18n %}{% blocktrans count days as days %}Your account {{ user }} will expire in {{ days }} day{% plural %}Your account {{ user }} will expire in {{ days }} days{% endblocktrans %} \ No newline at end of file +{% load i18n %} +Your account {{ user }} will expire in {{ days }} day. +سينتهي حسابك {{ user }} في غضون {{ days }} يوم. \ No newline at end of file diff --git a/templates/users/user_list.html b/templates/users/user_list.html index c7c0cb43..28a7e1d9 100644 --- a/templates/users/user_list.html +++ b/templates/users/user_list.html @@ -88,7 +88,7 @@ {% else %} {% url "pricing_page" request.dealer.slug as pricing_page_url %} - {% include "message-illustration.html" with value1="No Active Plan, please create your subscription plan." value2="Buy Plan" url=pricing_page_url %} + {% include "message-illustration.html" with value1=_("No active plan, Please create a subscription plan.") value2=_("Buy Plan") url=pricing_page_url %} {% endif %} {% endif %} {% endblock %}