{% trans "Rescheduling Successful" %}

-

{% trans "Your appointment rescheduling request has been successfully submitted. Please check your email and click on the confirmation link to finalize the rescheduling process." %}

+

+ {% trans "Your appointment rescheduling request has been successfully submitted. Please check your email and click on the confirmation link to finalize the rescheduling process." %} +

{% trans "Go to Homepage" %}
{% if messages %} {% for message in messages %} - {% endfor %} {% endif %} @@ -76,4 +86,4 @@ {% endblock %} {% block customJS %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/appointment/set_password.html b/templates/appointment/set_password.html index a92731ae..cfdc4564 100644 --- a/templates/appointment/set_password.html +++ b/templates/appointment/set_password.html @@ -83,22 +83,21 @@ {% block body %}

{% trans 'Reset Your Password' %}

- + {% if messages %}
    {% for message in messages %} - {{ message }} +
  • {{ message }}
    • {% endfor %}
{% endif %} - - +
{% csrf_token %} {{ form.as_p }}
-{% endblock %} -{% block customJS %} - -{% endblock %} \ No newline at end of file + {% endblock %} + {% block customJS %} + + {% endblock %} diff --git a/templates/appointment/thank_you.html b/templates/appointment/thank_you.html index 335760b8..314343b3 100644 --- a/templates/appointment/thank_you.html +++ b/templates/appointment/thank_you.html @@ -37,12 +37,18 @@ {% block body %}

{{ page_title }}

-

- {{ page_message }} -

+

{{ page_message }}

{% if messages %} {% for message in messages %} - {% endfor %} {% endif %} diff --git a/templates/auth_base.html b/templates/auth_base.html index 9bdba65d..15f6c912 100644 --- a/templates/auth_base.html +++ b/templates/auth_base.html @@ -1,91 +1,100 @@ -{% load static %} {% load i18n %} +{% load static %} +{% load i18n %} {% get_current_language as LANGUAGE_CODE %} - - - - {% block title %}{% trans 'HAIKAL' %}{% endblock %} - - - - - - - + + + {% block title %} + {% trans 'HAIKAL' %} + {% endblock %} + + + + + - + - - - - - - - - - - - + + + + + - - + + - + {% if LANGUAGE_CODE == 'en' %} - - + + {% else %} - - + + {% endif %} - - {% include 'messages.html' %}
-
- - {% block content %} - - {% endblock %} - - + {% block content %}{% endblock %}
- - -
- - - - - {% block customJS %}{% endblock customJS %} - - - - - - + + + + + {% block customJS %} + {% endblock customJS %} + + + @@ -102,5 +111,4 @@ - - \ No newline at end of file + diff --git a/templates/base.html b/templates/base.html index 913fe6c8..a487fd54 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,8 +1,12 @@ -{% load i18n static%} +{% load i18n static %} {% get_current_language as LANGUAGE_CODE %} @@ -10,22 +14,30 @@ - + - {% block title %} - - {% endblock %} - {% block description %} - {% endblock %} + {% block title %}{% endblock %} + {% block description %}{% endblock %} - - - - + + + + - + - {% comment %} {% endcomment %} @@ -33,68 +45,68 @@ {% comment %} {% endcomment %} - + {% comment %} {% endcomment %} - + {% comment %} {% endcomment %} {% comment %} {% endcomment %} {% if LANGUAGE_CODE == 'ar' %} - - + + {% else %} - - + + {% endif %} {% comment %} {% endcomment %} - - {% block customCSS %} - - {% endblock %} + {% block customCSS %}{% endblock %} - {% include "toast-alert.html" %}
{% if request.user.is_authenticated %} {% include 'header.html' %} {% endif %} -
- {% include "plans/expiration_messages.html" %} {% block period_navigation %} - {% endblock period_navigation %} - {% block content %} - - {% endblock content%} + {% endblock content %} {% block body %} - {% endblock body%} - - + {% endblock body %} {% include 'footer.html' %}
{% comment %} {% endcomment %} {% comment %} {% endcomment %} - - - - + + + - {% comment %} {% endcomment %} - {% comment %} {% endcomment %} @@ -104,15 +116,14 @@ {% comment %} {% endcomment %} {% comment %} {% endcomment %} {% comment %} - + {% endcomment %} - {% comment %} {% endcomment %} {% comment %} {% endcomment %} + {% comment %} {% endcomment %} - - {% block customJS %} - {% endblock %} - + {% block customJS %}{% endblock %} - \ No newline at end of file + diff --git a/templates/bill/bill_create.html b/templates/bill/bill_create.html index 4e0a8ae7..d46a325c 100644 --- a/templates/bill/bill_create.html +++ b/templates/bill/bill_create.html @@ -3,7 +3,6 @@ {% load static %} {% load django_ledger %} {% load crispy_forms_filters %} - {% block content %} {% comment %}
@@ -34,75 +33,53 @@
- - {% trans 'Cancel' %} + {% trans 'Cancel' %}
{% endcomment %} - - -
- -
-
-
-

- {% trans 'Create Bill' %} -

-
-
- -
-
- - {% csrf_token %} - {% if po_model %} -
-

{% trans 'Bill for' %} {{ po_model.po_number }}

-

{% trans 'Bill for' %} {{ po_model.po_title }}

-
- {% for itemtxs in po_itemtxs_qs %} - {{ itemtxs }} - {% endfor %} +
+
+
+

{% trans 'Create Bill' %}

+
+
+ +
+ {% csrf_token %} + {% if po_model %} +
+

{% trans 'Bill for' %} {{ po_model.po_number }}

+

{% trans 'Bill for' %} {{ po_model.po_title }}

+
+ {% for itemtxs in po_itemtxs_qs %}{{ itemtxs }}{% endfor %} +
+ {% endif %} +
{{ form|crispy }}
+
+
+
+ + {% trans 'Cancel' %}
- {% endif %} - -
- {{ form|crispy }}
-
- -
-
- - {% trans 'Cancel' %} -
-
- - - - + +
- -
- -
+
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/bill/bill_detail.html b/templates/bill/bill_detail.html index f0e71b30..a697679c 100644 --- a/templates/bill/bill_detail.html +++ b/templates/bill/bill_detail.html @@ -3,260 +3,220 @@ {% load static %} {% load django_ledger %} {% load custom_filters %} - {% block title %}Bill Details - {{ block.super }}{% endblock %} - {% block customCSS %} - + {% endblock %} - {% block content %} -
- -
-
-
-
-
- {% include 'bill/includes/card_bill.html' with dealer_slug=request.dealer.slug bill=bill entity_slug=view.kwargs.entity_slug style='bill-detail' %} - -
-
-
- -
-
- -
-
-
- -
{% trans 'Bill Notes' %}
-
-
- {% if perms.django_ledger.change_billmodel%} -
- {% include 'bill/includes/card_markdown.html' with style='card_1' title='' notes_html=bill.notes_html %} -
- {% endif %} -
-
- -
- - -
-
-
- {% if bill.is_configured %} -
-
-
-
-
-
- {% trans 'Cash Account' %}: - - {{ bill.cash_account.code }} - -
-

- {% currency_symbol %}{{ bill.get_amount_cash | absolute | currency_format }} -

-
-
- {% if bill.accrue %} -
-
-
- {% trans 'Prepaid Account' %}: - - {{ bill.prepaid_account.code }} - -
-

- {% currency_symbol %}{{ bill.get_amount_prepaid | currency_format }} -

-
-
-
-
-
- {% trans 'Accounts Payable' %}: - - {{ bill.unearned_account.code }} - -
-

- {% currency_symbol %}{{ bill.get_amount_unearned | currency_format }} -

-
-
-
-
-
- {% trans 'Accrued' %} {{ bill.get_progress | percentage }} -
-

- {% currency_symbol %}{{ bill.get_amount_earned | currency_format }} -

-
-
- {% else %} -
-
-
- {% trans 'You Still Owe' %} -
-

- {% currency_symbol %}{{ bill.get_amount_open | currency_format }} -

-
-
- {% endif %} +
+
+
+
+
+
+ {% include 'bill/includes/card_bill.html' with dealer_slug=request.dealer.slug bill=bill entity_slug=view.kwargs.entity_slug style='bill-detail' %}
- {% endif %} - -
-
- -
+
- -
{% trans 'Bill Items' %}
+ +
{% trans 'Bill Notes' %}
-
-
- - - - - - - - - - - - - {% for bill_item in itemtxs_qs %} - - - - - - - - - {% endfor %} - - - - - - - - - -
{% trans 'Item' %}{% trans 'Entity Unit' %}{% trans 'Unit Cost' %}{% trans 'Quantity' %}{% trans 'Total' %}{% trans 'PO' %}
-
-
-
{{ bill_item.item_model }}
-
+ {% if perms.django_ledger.change_billmodel %} +
+ {% include 'bill/includes/card_markdown.html' with style='card_1' title='' notes_html=bill.notes_html %} +
+ {% endif %} +
+ + +
+
+
+ {% if bill.is_configured %} +
+
+
+
+
+
+ {% trans 'Cash Account' %}: + {{ bill.cash_account.code }} +
+

+ {% currency_symbol %}{{ bill.get_amount_cash | absolute | currency_format }} +

+
+
+ {% if bill.accrue %} +
+
+
+ {% trans 'Prepaid Account' %}: + + {{ bill.prepaid_account.code }} + +
+

+ {% currency_symbol %}{{ bill.get_amount_prepaid | currency_format }} +

-
- - {% if bill_item.entity_unit %} - {{ bill_item.entity_unit }} - {% endif %} - - - - {{ bill_item.unit_cost | currency_format }} - - - {{ bill_item.quantity }} - - - {{ bill_item.total_amount | currency_format }} - - - {% if bill_item.po_model_id %} - {% if perms.django_ledger.view_purchaseordermodel%} - - {% trans 'View PO' %} - - {% endif %} - {% endif %} -
{% trans 'Total' %} - - {% currency_symbol %}{{ total_amount__sum | currency_format }} - -
+
+
+
+
+ {% trans 'Accounts Payable' %}: + + {{ bill.unearned_account.code }} + +
+

+ {% currency_symbol %}{{ bill.get_amount_unearned | currency_format }} +

+
+
+
+
+
{% trans 'Accrued' %} {{ bill.get_progress | percentage }}
+

{% currency_symbol %}{{ bill.get_amount_earned | currency_format }}

+
+
+ {% else %} +
+
+
{% trans 'You Still Owe' %}
+

+ {% currency_symbol %}{{ bill.get_amount_open | currency_format }} +

+
+
+ {% endif %} +
+
+
+ {% endif %} +
+
+
+
+
+ +
{% trans 'Bill Items' %}
+
+
+
+
+ + + + + + + + + + + + + {% for bill_item in itemtxs_qs %} + + + + + + + + + {% endfor %} + + + + + + + + + +
{% trans 'Item' %}{% trans 'Entity Unit' %}{% trans 'Unit Cost' %}{% trans 'Quantity' %}{% trans 'Total' %}{% trans 'PO' %}
+
+
+
{{ bill_item.item_model }}
+
+
+ 		+ + {% if bill_item.entity_unit %}{{ bill_item.entity_unit }}{% endif %} + + + {{ bill_item.unit_cost | currency_format }} + + {{ bill_item.quantity }} + + {{ bill_item.total_amount | currency_format }} + + {% if bill_item.po_model_id %} + {% if perms.django_ledger.view_purchaseordermodel %} + + {% trans 'View PO' %} + + {% endif %} + {% endif %} +
+ {% trans 'Total' %} + + {% currency_symbol %}{{ total_amount__sum | currency_format }} +
+
- - -
- -
- -
-
-
- -
{% trans 'Bill Transactions' %}
+
+
+
+
+ +
{% trans 'Bill Transactions' %}
+
-
-
- {% transactions_table bill %} +
{% transactions_table bill %}
- -
-
-
- - -
- {% include "bill/includes/mark_as.html" %} -{% endblock %} \ No newline at end of file + {% include "bill/includes/mark_as.html" %} +{% endblock %} diff --git a/templates/bill/bill_update.html b/templates/bill/bill_update.html index 508b99eb..a4f52273 100644 --- a/templates/bill/bill_update.html +++ b/templates/bill/bill_update.html @@ -4,56 +4,36 @@ {% load django_ledger %} {% load custom_filters %} {% load widget_tweaks crispy_forms_filters %} - {% block content %}
- - +
-
-
-
- {% include 'bill/includes/card_bill.html' with dealer_slug=request.dealer.slug bill=bill_model style='bill-detail' entity_slug=view.kwargs.entity_slug %} - -
- {% csrf_token %} - -
- {{ form|crispy }} +
+
+ {% include 'bill/includes/card_bill.html' with dealer_slug=request.dealer.slug bill=bill_model style='bill-detail' entity_slug=view.kwargs.entity_slug %} + + {% csrf_token %} +
{{ form|crispy }}
+ + + {% trans 'Back to Bill Detail' %} + +
- - - - {% trans 'Back to Bill Detail' %} - - - - - - - -
-
-
-
- - - -
- {% bill_item_formset_table itemtxs_formset %}
- - + +
{% bill_item_formset_table itemtxs_formset %}
{% include "bill/includes/mark_as.html" %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/bill/includes/card_bill.html b/templates/bill/includes/card_bill.html index 9e3dd164..b73a2a03 100644 --- a/templates/bill/includes/card_bill.html +++ b/templates/bill/includes/card_bill.html @@ -1,22 +1,19 @@ {% load django_ledger %} {% load i18n %}
- {% if not create_bill %} {% if style == 'dashboard' %}
-
{% trans 'Bill' %}
- {{ bill.get_bill_status_display }} + {{ bill.get_bill_status_display }}

{{ bill.vendor.vendor_name }}

{{ bill.vendor.address_1 }}

- {% if not bill.is_past_due %}

{% trans 'Due in' %}: {{ bill.date_due | timeuntil }} @@ -26,7 +23,6 @@ {% trans 'Past Due' %}: {{ bill.date_due | timesince }} {% trans 'ago' %}

{% endif %} -
{% trans 'Accrued' %}: {% if bill.accrue %} @@ -35,7 +31,6 @@ {% endif %}
-

{% trans 'Amount Due' %}: {% currency_symbol %}{{ bill.get_amount_open | currency_format }} @@ -43,78 +38,56 @@

{% trans 'Amount Paid' %}: {% currency_symbol %}{{ bill.amount_paid | currency_format }}

-

- {% trans 'Progress' %}: {{ bill.get_progress | percentage }} -

+

{% trans 'Progress' %}: {{ bill.get_progress | percentage }}

-
+ aria-valuemax="100">
- {% modal_action bill 'get' entity_slug %}
- - {% trans 'View' %} - + class="btn btn-sm btn-phoenix-primary me-md-2">{% trans 'View' %} {% if perms.django_ledger.change_billmodel %} - - {% trans 'Update' %} - - - {% if bill.can_pay %} - - + {% trans 'Update' %} + {% if bill.can_pay %} + + {% endif %} + {% if bill.can_cancel %} + + {% endif %} {% endif %} - {% if bill.can_cancel %} - - {% endif %} - {% endif %}
- {% elif style == 'bill-detail' %}
-

- {% trans 'Bill' %} {{ bill.bill_number }} -

- +

{% trans 'Bill' %} {{ bill.bill_number }}

- - {% trans 'Back to Bill List' %} - - - - + + {% trans 'Back to Bill List' %} +
{% if bill.is_draft %}

{% trans 'This bill is' %} {{ bill.get_bill_status_display }}

- {% trans 'Vendor Name' %}: - {{ bill.vendor.vendor_name }} -

+ {% trans 'Vendor Name' %}: + {{ bill.vendor.vendor_name }} +

{% trans 'Amount Due' %}: @@ -136,9 +109,9 @@ {% elif bill.is_review %}

{% trans 'This bill is' %} {{ bill.get_bill_status_display }}

- {% trans 'Vendor Name' %}: - {{ bill.vendor.vendor_name }} -

+ {% trans 'Vendor Name' %}: + {{ bill.vendor.vendor_name }} +

{% trans 'Amount Due' %}: @@ -163,9 +136,9 @@ {% elif bill.is_approved %}

{% trans 'This bill is' %} {{ bill.get_bill_status_display }}

- {% trans 'Vendor Name' %}: - {{ bill.vendor.vendor_name }} -

+ {% trans 'Vendor Name' %}: + {{ bill.vendor.vendor_name }} +

{% trans 'Amount Due' %}: @@ -189,8 +162,7 @@ style="width: {{ bill.get_progress_percent }}%" aria-valuenow="{{ bill.get_progress_percent }}" aria-valuemin="0" - aria-valuemax="100"> -

+ aria-valuemax="100">
{% if bill.xref %} @@ -198,10 +170,10 @@ {% endif %} {% elif bill.is_paid %}

{% trans 'This bill is' %} {{ bill.get_bill_status_display }}

-

- {% trans 'Vendor Name' %}: - {{ bill.vendor.vendor_name }} -

+

+ {% trans 'Vendor Name' %}: + {{ bill.vendor.vendor_name }} +

{% trans 'Amount Paid' %}: @@ -221,95 +193,91 @@ {% trans 'Bill Amount' %}: {% currency_symbol %}{{ bill.amount_due | currency_format }}

-

- {{ bill.get_bill_status_display | upper }} -

+

{{ bill.get_bill_status_display | upper }}

{% endif %}
- {% if perms.django_ledger.change_billmodel%} - - - {% if bill.can_draft %} - + + {% if bill.can_draft %} + + {% endif %} + + {% if bill.can_review %} + + {% endif %} + + {% if bill.can_approve and perms.django_ledger.can_approve_billmodel %} + + {% endif %} + {% if bill.can_approve and not request.is_manager %} + + {% endif %} + + {% if bill.can_pay %} + + {% endif %} + + {% if bill.can_void %} + + {% endif %} + + {% if bill.can_cancel %} + + {% modal_action_v2 bill bill.get_mark_as_canceled_url bill.get_mark_as_canceled_message bill.get_mark_as_canceled_html_id %} + {% endif %} {% endif %} - - {% if bill.can_review %} - - {% endif %} - - {% if bill.can_approve and perms.django_ledger.can_approve_billmodel %} - - {% endif %} - {% if bill.can_approve and not request.is_manager %} - - {% endif %} - - {% if bill.can_pay %} - - {% endif %} - - {% if bill.can_void %} - - {% endif %} - - {% if bill.can_cancel %} - - {% modal_action_v2 bill bill.get_mark_as_canceled_url bill.get_mark_as_canceled_message bill.get_mark_as_canceled_html_id %} - {% endif %} - {% endif %}
- {% endif %} {% else %} - {% if perms.django_ledger.add_billmodel%} -
- -
- - -

{% trans 'New Bill' %}

- + {% if perms.django_ledger.add_billmodel %} +
+
+ + +

{% trans 'New Bill' %}

+ +
-
{% endif %} {% endif %}
- - \ No newline at end of file + diff --git a/templates/bill/includes/card_markdown.html b/templates/bill/includes/card_markdown.html index 7399ce12..3197479d 100644 --- a/templates/bill/includes/card_markdown.html +++ b/templates/bill/includes/card_markdown.html @@ -1,15 +1,13 @@ {% load trans from i18n %} {% load django_ledger %} - {% if style == 'card_1' %} -
- -
- {% if notes_html %} - {{ notes_html|safe }} - {% else %} -

{% trans 'No available notes to display...' %}

- {% endif %} +
+
+ {% if notes_html %} + {{ notes_html|safe }} + {% else %} +

{% trans 'No available notes to display...' %}

+ {% endif %} +
-
{% endif %} diff --git a/templates/bill/includes/card_vendor.html b/templates/bill/includes/card_vendor.html index 81ece8bf..292abb2e 100644 --- a/templates/bill/includes/card_vendor.html +++ b/templates/bill/includes/card_vendor.html @@ -1,19 +1,21 @@ {% load i18n %} {% load django_ledger %} - -
+

- - + + {% trans 'Vendor Info' %}

-

{{ vendor.vendor_name }}

-

{% if vendor.address_1 %}{{ vendor.address_1 }}{% endif %} {% if vendor.address_2 %}{{ vendor.address_2 }}{% endif %} @@ -23,4 +25,4 @@ {% if vendor.website %}{{ vendor.website }}{% endif %}

-
\ No newline at end of file +
diff --git a/templates/bill/includes/mark_as.html b/templates/bill/includes/mark_as.html index 3d1497ec..20064f40 100644 --- a/templates/bill/includes/mark_as.html +++ b/templates/bill/includes/mark_as.html @@ -4,11 +4,14 @@
- +
-
\ No newline at end of file +
diff --git a/templates/bill/tags/bill_item_formset.html b/templates/bill/tags/bill_item_formset.html index 1d62d4ea..a6955dd7 100644 --- a/templates/bill/tags/bill_item_formset.html +++ b/templates/bill/tags/bill_item_formset.html @@ -2,8 +2,8 @@ {% load static %} {% load django_ledger %} {% load widget_tweaks %} - -
+
@@ -15,14 +15,12 @@
-
{% csrf_token %} {{ item_formset.non_form_errors }} {{ item_formset.management_form }} -
@@ -44,33 +42,25 @@ {% for f in item_formset %} - +
- {% for hidden_field in f.hidden_fields %} - {{ hidden_field }} - {% endfor %} + {% for hidden_field in f.hidden_fields %}{{ hidden_field }}{% endfor %} {{ f.item_model|add_class:"form-control" }} - {% if f.errors %} - {{ f.errors }} - {% endif %} + {% if f.errors %}{{ f.errors }}{% endif %}
- - + {% if f.instance.po_quantity %}{{ f.instance.po_quantity }}{% endif %} - - + {% if f.instance.po_total_amount %}
- - {% currency_symbol %}{{ f.instance.po_total_amount | currency_format }} - + {% currency_symbol %}{{ f.instance.po_total_amount | currency_format }} {% trans 'View PO' %} @@ -78,54 +68,38 @@
{% endif %} - - + -
- {{ f.quantity|add_class:"form-control" }} -
+
{{ f.quantity|add_class:"form-control" }}
- - + -
- {{ f.unit_cost|add_class:"form-control" }} -
+
{{ f.unit_cost|add_class:"form-control" }}
- - - - {{ f.entity_unit|add_class:"form-control" }} - - - + + {{ f.entity_unit|add_class:"form-control" }} + {% currency_symbol %}{{ f.instance.total_amount | currency_format }} - - + - {% if item_formset.can_delete %} -
- {{ f.DELETE }} -
- {% endif %} + {% if item_formset.can_delete %}
{{ f.DELETE }}
{% endif %} {% endfor %} - - {% trans 'Total' %} - - {% currency_symbol %}{{ total_amount__sum | currency_format }} - + {% trans 'Total' %} + + + {% currency_symbol %}{{ total_amount__sum | currency_format }} @@ -136,7 +110,6 @@
-
diff --git a/templates/bill/tags/bill_table.html b/templates/bill/tags/bill_table.html index 30594351..f0fef517 100644 --- a/templates/bill/tags/bill_table.html +++ b/templates/bill/tags/bill_table.html @@ -1,8 +1,6 @@ {% load django_ledger %} {% load i18n %} -
- @@ -23,17 +21,16 @@ - - + +
{{ bill.get_bill_status_display }} {{ bill.get_status_action_date }} {{ bill.vendor.vendor_name }} - {% currency_symbol %}{{ bill.amount_due | currency_format }} - {% currency_symbol %}{{ bill.amount_paid | currency_format }}{% currency_symbol %}{{ bill.amount_due | currency_format }}{% currency_symbol %}{{ bill.amount_paid | currency_format }} {% if bill.is_past_due %} {% icon 'bi:check-circle-fill' 24 %} {% endif %} -
-
diff --git a/templates/bill/transactions/tags/txs_table.html b/templates/bill/transactions/tags/txs_table.html index 09f87b38..ca08fa59 100644 --- a/templates/bill/transactions/tags/txs_table.html +++ b/templates/bill/transactions/tags/txs_table.html @@ -1,11 +1,9 @@ {% load i18n %} {% load django_ledger %} - {% if style == 'detail' %} -
- + @@ -17,23 +15,31 @@ - {% for transaction_model in transaction_model_qs %} - - + - - - - + + + + {% endfor %} - - + + @@ -56,9 +62,15 @@ - - - + + + {% endfor %} @@ -72,4 +84,3 @@
{% trans 'Timestamp' %} {% trans 'Account' %}
{{ transaction_model.timestamp }}{{ transaction_model.timestamp }} {{ transaction_model.account_code }} {{ transaction_model.account_name }}{% if transaction_model.entity_unit_name %}{{ transaction_model.entity_unit_name }}{% endif %}{% if transaction_model.is_credit %}{{ transaction_model.amount | currency_format }}{% endif %}{% if transaction_model.is_debit %}{{ transaction_model.amount | currency_format }}{% endif %}{% if transaction_model.description %}{{ transaction_model.description }}{% endif %} + {% if transaction_model.entity_unit_name %}{{ transaction_model.entity_unit_name }}{% endif %} + + {% if transaction_model.is_credit %}{{ transaction_model.amount | currency_format }}{% endif %} + + {% if transaction_model.is_debit %}{{ transaction_model.amount | currency_format }}{% endif %} + + {% if transaction_model.description %}{{ transaction_model.description }}{% endif %} +
{% trans 'Total' %}{% currency_symbol %}{{ total_credits | currency_format }}{% trans 'Total' %} + {% currency_symbol %}{{ total_credits | currency_format }} + {% currency_symbol %}{{ total_debits | currency_format }}
{{ transaction_model.account_code }} {{ transaction_model.account_name }}{% if transaction_model.is_credit %}{{ transaction_model.amount | currency_format }}{% endif %}{% if transaction_model.is_debit %}{{ transaction_model.amount | currency_format }}{% endif %}{% if transaction_model.description %}{{ transaction_model.description }}{% endif %} + {% if transaction_model.is_credit %}{{ transaction_model.amount | currency_format }}{% endif %} + + {% if transaction_model.is_debit %}{{ transaction_model.amount | currency_format }}{% endif %} + + {% if transaction_model.description %}{{ transaction_model.description }}{% endif %} +
{% endif %} - diff --git a/templates/chat_support.html b/templates/chat_support.html index 6035e9d6..680752d4 100644 --- a/templates/chat_support.html +++ b/templates/chat_support.html @@ -1,43 +1,84 @@
-
-
-
-
Demo widget
-
- -
Request a callbackSearch in chatShow historyReport to AdminClose Support
+
+
+
+
+ Demo widget +
+
+ +
+ Request a callbackSearch in chatShow historyReport to AdminClose Support +
+
+
+
+
+
+ +

I need help with something

+ + +

I can’t reorder a product I previously ordered

+ + +

How do I place an order?

+ + +

My payment method not working

+ +
-
-
-
-
-

I need help with something

- -

I can’t reorder a product I previously ordered

- -

How do I place an order?

- -

My payment method not working

- -
-
-
+
+
+ +
Eric
-

Ask us anything – we’ll get back to you here or by email within 24 hours.

-
+

+ Ask us anything – we’ll get back to you here or by email within 24 hours. +

-
-
-
- - - - - -
- -
-
- -
\ No newline at end of file +
+
+
+ + + + + +
+ +
+
+
+ +
diff --git a/templates/components/activity_modal.html b/templates/components/activity_modal.html index 76b9b572..69aafd9c 100644 --- a/templates/components/activity_modal.html +++ b/templates/components/activity_modal.html @@ -1,30 +1,38 @@ {% load static i18n crispy_forms_tags %} -