mirror of
https://github.com/Hopiu/djLint.git
synced 2026-05-19 02:21:06 +00:00
disallow negative indent when there is a tag missmatch.
This commit is contained in:
Christopher Pickering
parent
969dd046bf
commit
65af0bcb35
244 changed files with 2028 additions and 3875 deletions
|
|
@ -59,14 +59,10 @@
|
|||
{% endif %}
|
||||
{% endif %}
|
||||
{% if user.has_usable_password %}
|
||||
<a href="{% url 'admin:password_change' %}">
|
||||
{% translate 'Change password' %}
|
||||
</a>
|
||||
<a href="{% url 'admin:password_change' %}">{% translate 'Change password' %}</a>
|
||||
/
|
||||
{% endif %}
|
||||
<a href="{% url 'admin:logout' %}">
|
||||
{% translate 'Log out' %}
|
||||
</a>
|
||||
<a href="{% url 'admin:logout' %}">{% translate 'Log out' %}</a>
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -97,9 +97,7 @@
|
|||
<h2>{% translate 'Filter' %}</h2>
|
||||
{% if cl.has_active_filters %}
|
||||
<h3 id="changelist-filter-clear">
|
||||
<a href="{{ cl.clear_all_filters_qs }}">
|
||||
✖ {% translate "Clear all filters" %}
|
||||
</a>
|
||||
<a href="{{ cl.clear_all_filters_qs }}">✖ {% translate "Clear all filters" %}</a>
|
||||
</h3>
|
||||
{% endif %}
|
||||
{% for spec in cl.filter_specs %}
|
||||
|
|
|
|||
|
|
@ -30,9 +30,7 @@
|
|||
{% endif %}
|
||||
<div class="text">
|
||||
{% if header.sortable %}
|
||||
<a href="{{ header.url_primary }}">
|
||||
{{ header.text|capfirst }}
|
||||
</a>
|
||||
<a href="{{ header.url_primary }}">{{ header.text|capfirst }}</a>
|
||||
{% else %}
|
||||
<span>{{ header.text|capfirst }}</span>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -75,9 +75,7 @@
|
|||
<input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}">
|
||||
{% endif %}
|
||||
<input type="submit" value="{% translate 'Yes, I’m sure' %}">
|
||||
<a href="#" class="button cancel-link">
|
||||
{% translate "No, take me back" %}
|
||||
</a>
|
||||
<a href="#" class="button cancel-link">{% translate "No, take me back" %}</a>
|
||||
</div>
|
||||
</form>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -71,9 +71,7 @@
|
|||
<input type="hidden" name="action" value="delete_selected">
|
||||
<input type="hidden" name="post" value="yes">
|
||||
<input type="submit" value="{% translate 'Yes, I’m sure' %}">
|
||||
<a href="#" class="button cancel-link">
|
||||
{% translate "No, take me back" %}
|
||||
</a>
|
||||
<a href="#" class="button cancel-link">{% translate "No, take me back" %}</a>
|
||||
</div>
|
||||
</form>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -31,9 +31,7 @@
|
|||
{% if entry.is_deletion or not entry.get_admin_url %}
|
||||
{{ entry.object_repr }}
|
||||
{% else %}
|
||||
<a href="{{ entry.get_admin_url }}">
|
||||
{{ entry.object_repr }}
|
||||
</a>
|
||||
<a href="{{ entry.get_admin_url }}">{{ entry.object_repr }}</a>
|
||||
{% endif %}
|
||||
<br>
|
||||
{% if entry.content_type %}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,7 @@
|
|||
/
|
||||
{% endif %}
|
||||
{% translate 'Change password' %} /
|
||||
<a href="{% url 'admin:logout' %}">
|
||||
{% translate 'Log out' %}
|
||||
</a>
|
||||
<a href="{% url 'admin:logout' %}">{% translate 'Log out' %}</a>
|
||||
{% endblock %}
|
||||
{% block breadcrumbs %}
|
||||
<div class="breadcrumbs">
|
||||
|
|
|
|||
|
|
@ -11,9 +11,7 @@
|
|||
/
|
||||
{% endif %}
|
||||
{% translate 'Change password' %} /
|
||||
<a href="{% url 'admin:logout' %}">
|
||||
{% translate 'Log out' %}
|
||||
</a>
|
||||
<a href="{% url 'admin:logout' %}">{% translate 'Log out' %}</a>
|
||||
{% endblock %}
|
||||
{% block breadcrumbs %}
|
||||
<div class="breadcrumbs">
|
||||
|
|
|
|||
|
|
@ -61,9 +61,7 @@
|
|||
</p>
|
||||
<p>
|
||||
Generated by
|
||||
<a href="https://www.django-cms.org">
|
||||
django cms
|
||||
</a>
|
||||
<a href="https://www.django-cms.org">django cms</a>
|
||||
{% now "d.m.Y H:i:s" %}.
|
||||
</p>
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -13,9 +13,7 @@
|
|||
<th>{% trans "Can change permissions" %}</th>
|
||||
<th>{% trans "Can move" %}</th>
|
||||
<th>{% trans "Can view" %}</th>
|
||||
<th>
|
||||
{% trans "Grant on" %}
|
||||
</th>
|
||||
<th>{% trans "Grant on" %}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
|
|||
|
|
@ -7,9 +7,7 @@
|
|||
{% endif %}
|
||||
<p class="deletelink-box">
|
||||
{% if show_delete_link %}
|
||||
<a href="delete/" class="deletelink">
|
||||
{% trans "Delete" %}
|
||||
</a>
|
||||
<a href="delete/" class="deletelink">{% trans "Delete" %}</a>
|
||||
{% endif %}
|
||||
{% if show_buttons %}
|
||||
<a href="{% url opts|admin_urlname:'change' object_id %}?language={{ language }}"
|
||||
|
|
|
|||
|
|
@ -127,33 +127,25 @@
|
|||
{% endif %}
|
||||
{% if page.changed_date %}
|
||||
<p title="{% filter escapejs %}{% trans ">
|
||||
<strong>
|
||||
{% filter escapejs %}{% trans "last change on" %}{% endfilter %}:
|
||||
</strong>
|
||||
<strong>{% filter escapejs %}{% trans "last change on" %}{% endfilter %}:</strong>
|
||||
{{ page.changed_date|date:"Y-m-d H:i:s" }}
|
||||
</p>
|
||||
{% endif %}
|
||||
{% if page.get_template_display %}
|
||||
<p title="{% filter escapejs %}{% trans ">
|
||||
<strong>
|
||||
{% filter escapejs %}{% trans "template" %}{% endfilter %}:
|
||||
</strong>
|
||||
<strong>{% filter escapejs %}{% trans "template" %}{% endfilter %}:</strong>
|
||||
{{ page.get_template_display }}
|
||||
</p>
|
||||
{% endif %}
|
||||
{% if metadata %}
|
||||
<p title="{% filter escapejs %}{% trans ">
|
||||
<strong>
|
||||
{% filter escapejs %}{% trans "meta" %}{% endfilter %}:
|
||||
</strong>
|
||||
<strong>{% filter escapejs %}{% trans "meta" %}{% endfilter %}:</strong>
|
||||
{{ metadata }}
|
||||
</p>
|
||||
{% endif %}
|
||||
{% if page.site %}
|
||||
<p title="{% filter escapejs %}{% trans ">
|
||||
<strong>
|
||||
{% filter escapejs %}{% trans "site" %}{% endfilter %}:
|
||||
</strong>
|
||||
<strong>{% filter escapejs %}{% trans "site" %}{% endfilter %}:</strong>
|
||||
{{ page.site }}
|
||||
</p>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@
|
|||
<span class="cms-pagetree-dropdown js-cms-pagetree-dropdown">
|
||||
<div class="js-cms-pagetree-dropdown-trigger cms-pagetree-legend-title-wrap">
|
||||
<span class="cms-icon cms-icon-info"></span>
|
||||
<span class="cms-pagetree-legend-title">
|
||||
{% trans "Legend" %}
|
||||
</span>
|
||||
<span class="cms-pagetree-legend-title">{% trans "Legend" %}</span>
|
||||
</div>
|
||||
<div class="cms-pagetree-dropdown-menu cms-pagetree-dropdown-menu-condensed cms-pagetree-dropdown-menu-arrow-right-bottom js-cms-pagetree-dropdown-menu">
|
||||
<ul class="cms-pagetree-dropdown-menu-inner">
|
||||
|
|
|
|||
|
|
@ -26,9 +26,7 @@
|
|||
{% endblock %}
|
||||
{% block breadcrumbs %}
|
||||
<div class="breadcrumbs">
|
||||
<a href="{% cms_admin_url 'index' %}">
|
||||
{% trans 'Home' %}
|
||||
</a>
|
||||
<a href="{% cms_admin_url 'index' %}">{% trans 'Home' %}</a>
|
||||
›
|
||||
<a href="{% cms_admin_url 'app_list' app_label=opts.app_label %}">
|
||||
{{ app_label|capfirst|escape }}
|
||||
|
|
|
|||
|
|
@ -13,9 +13,7 @@
|
|||
{% for p in module.list %}
|
||||
{% if p.value != 'AliasPlugin' and p.value != 'PlaceholderPlugin' %}
|
||||
<div class="cms-submenu-item">
|
||||
<a data-rel="add" href="{{ p.value }}">
|
||||
{{ p.name }}
|
||||
</a>
|
||||
<a data-rel="add" href="{{ p.value }}">{{ p.name }}</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
>
|
||||
<span>
|
||||
{{ name }}
|
||||
<span class="cms-icon cms-icon-arrow"></span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<span class="cms-icon cms-icon-arrow"></span></span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
href="{{ url }}">
|
||||
<span>
|
||||
{{ name }}
|
||||
<span class="cms-icon cms-icon-arrow"></span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<span class="cms-icon cms-icon-arrow"></span></span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
>
|
||||
<span>
|
||||
{{ name }}
|
||||
<span class="cms-icon cms-icon-arrow"></span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<span class="cms-icon cms-icon-arrow"></span></span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
>
|
||||
<span>
|
||||
{{ name }}
|
||||
<span class="cms-icon cms-icon-arrow"></span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<span class="cms-icon cms-icon-arrow"></span></span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -4,12 +4,11 @@
|
|||
href="{{ url }}">
|
||||
<span>
|
||||
{{ title }}
|
||||
<span class="cms-icon cms-icon-arrow"></span>
|
||||
</span>
|
||||
</a>
|
||||
{% if items %}
|
||||
<ul>
|
||||
{% for item in items %}{{ item.render }}{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
</li>
|
||||
<span class="cms-icon cms-icon-arrow"></span></span>
|
||||
</a>
|
||||
{% if items %}
|
||||
<ul>
|
||||
{% for item in items %}{{ item.render }}{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -20,20 +20,19 @@
|
|||
<a href="#">
|
||||
<span>
|
||||
{% trans "More" %}...
|
||||
<span class="cms-icon cms-icon-arrow"></span>
|
||||
</span>
|
||||
</a>
|
||||
<ul data-touch-action="pan-y"></ul>
|
||||
</li>
|
||||
</ul>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="cms-toolbar-right">
|
||||
{% for item in cms_toolbar.get_right_items %}
|
||||
{{ item.render }}
|
||||
{% endfor %}
|
||||
<span class="cms-icon cms-icon-arrow"></span></span>
|
||||
</a>
|
||||
<ul data-touch-action="pan-y"></ul>
|
||||
</li>
|
||||
</ul>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="cms-toolbar-right">
|
||||
{% for item in cms_toolbar.get_right_items %}
|
||||
{{ item.render }}
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
{# end: toolbar #}
|
||||
{% block toolbar_bottom %}{% endblock toolbar_bottom %}
|
||||
</div>
|
||||
{# end: toolbar #}
|
||||
{% block toolbar_bottom %}{% endblock toolbar_bottom %}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -45,64 +45,61 @@
|
|||
<div class="cms-modal-head" data-touch-action="none">
|
||||
<span class="cms-modal-title" data-touch-action="none">
|
||||
<span class="cms-modal-title-prefix"></span>
|
||||
<span class="cms-modal-title-suffix"></span>
|
||||
</span>
|
||||
<span tabindex="0"
|
||||
class="cms-modal-minimize cms-icon cms-icon-minus"
|
||||
title="{% trans 'Minimize' %}"></span>
|
||||
<span tabindex="0"
|
||||
class="cms-modal-maximize cms-icon cms-icon-window"
|
||||
title="{% trans 'Maximize' %}"></span>
|
||||
<span tabindex="0" class="cms-modal-close cms-icon cms-icon-close" title="{% trans 'Close' %}"></span>
|
||||
</div>
|
||||
<div class="cms-modal-breadcrumb" data-touch-action="pan-x"></div>
|
||||
<div class="cms-modal-body">
|
||||
<div class="cms-modal-shim"></div>
|
||||
<div class="cms-modal-frame"></div>
|
||||
</div>
|
||||
<div class="cms-modal-foot">
|
||||
<div class="cms-modal-buttons"></div>
|
||||
<div class="cms-modal-resize">
|
||||
<span class="cms-icon cms-icon-handler"></span>
|
||||
<span class="cms-modal-title-suffix"></span></span>
|
||||
<span tabindex="0"
|
||||
class="cms-modal-minimize cms-icon cms-icon-minus"
|
||||
title="{% trans 'Minimize' %}"></span>
|
||||
<span tabindex="0"
|
||||
class="cms-modal-maximize cms-icon cms-icon-window"
|
||||
title="{% trans 'Maximize' %}"></span>
|
||||
<span tabindex="0" class="cms-modal-close cms-icon cms-icon-close" title="{% trans 'Close' %}"></span>
|
||||
</div>
|
||||
<div class="cms-modal-breadcrumb" data-touch-action="pan-x"></div>
|
||||
<div class="cms-modal-body">
|
||||
<div class="cms-modal-shim"></div>
|
||||
<div class="cms-modal-frame"></div>
|
||||
</div>
|
||||
<div class="cms-modal-foot">
|
||||
<div class="cms-modal-buttons"></div>
|
||||
<div class="cms-modal-resize">
|
||||
<span class="cms-icon cms-icon-handler"></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{# start: structure #}
|
||||
<div class="cms-structure">
|
||||
<div class="cms-structure-content" data-touch-action="pan-y">
|
||||
{% if cms_renderer.load_structure %}
|
||||
{% for placeholder in cms_renderer.get_rendered_editable_placeholders %}
|
||||
<div class="cms-dragarea cms-dragarea-{{ placeholder.pk|unlocalize }}{% if placeholder.is_static %}cms-dragarea-static{% endif %}">
|
||||
{% include cms_toolbar.templates.dragbar_template with placeholder=placeholder %}
|
||||
<div class="cms-draggables cms-draggables-root">
|
||||
<div class="cms-draggables-empty">
|
||||
{% trans "Drop a plugin here" %}
|
||||
{# start: structure #}
|
||||
<div class="cms-structure">
|
||||
<div class="cms-structure-content" data-touch-action="pan-y">
|
||||
{% if cms_renderer.load_structure %}
|
||||
{% for placeholder in cms_renderer.get_rendered_editable_placeholders %}
|
||||
<div class="cms-dragarea cms-dragarea-{{ placeholder.pk|unlocalize }}{% if placeholder.is_static %}cms-dragarea-static{% endif %}">
|
||||
{% include cms_toolbar.templates.dragbar_template with placeholder=placeholder %}
|
||||
<div class="cms-draggables cms-draggables-root">
|
||||
<div class="cms-draggables-empty">
|
||||
{% trans "Drop a plugin here" %}
|
||||
</div>
|
||||
{% for plugin in placeholder.get_cached_plugins %}
|
||||
{% include cms_toolbar.templates.drag_item_template with plugin=plugin %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% for plugin in placeholder.get_cached_plugins %}
|
||||
{% include cms_toolbar.templates.drag_item_template with plugin=plugin %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{# end: structure #}
|
||||
{% if cms_toolbar.redirect_url %}
|
||||
<div class="cms-screenblock">
|
||||
<div class="cms-screenblock-inner">
|
||||
<h1>{% trans "This page has no preview!" %}</h1>
|
||||
<p>
|
||||
{% trans "It is being redirected to:" %}
|
||||
<a href="{{ cms_toolbar.redirect_url }}">
|
||||
{{ cms_toolbar.redirect_url }}
|
||||
</a>
|
||||
</p>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
<script type="text/javascript" data-cms>
|
||||
{# end: structure #}
|
||||
{% if cms_toolbar.redirect_url %}
|
||||
<div class="cms-screenblock">
|
||||
<div class="cms-screenblock-inner">
|
||||
<h1>{% trans "This page has no preview!" %}</h1>
|
||||
<p>
|
||||
{% trans "It is being redirected to:" %}
|
||||
<a href="{{ cms_toolbar.redirect_url }}">{{ cms_toolbar.redirect_url }}</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
<script type="text/javascript" data-cms>
|
||||
var CMS = CMS || {};
|
||||
CMS._plugins = CMS._plugins || [];
|
||||
</script>
|
||||
{% endblock toolbar_bottom %}
|
||||
</script>
|
||||
{% endblock toolbar_bottom %}
|
||||
|
|
|
|||
|
|
@ -63,9 +63,7 @@
|
|||
<footer class="cms-welcome-footer">
|
||||
<h2 class="cms-hidden">{% trans "Installation Notes" %}</h2>
|
||||
<p class="cms-welcome-links">
|
||||
<a href="//django-cms.org/" target="_blank">
|
||||
{% trans "django CMS" %}
|
||||
</a>
|
||||
<a href="//django-cms.org/" target="_blank">{% trans "django CMS" %}</a>
|
||||
<a href="//django-cms.org/en/support" target="_blank">
|
||||
{% trans "Support" %}
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -6,9 +6,7 @@
|
|||
<div class="columns is-centered">
|
||||
<div class="column is-8-tablet is-6-desktop">
|
||||
<div class="box">
|
||||
<h3 class="is-size-3 has-text-centered">
|
||||
{{ page_title }}
|
||||
</h3>
|
||||
<h3 class="is-size-3 has-text-centered">{{ page_title }}</h3>
|
||||
<p class="has-text-weight-bold has-text-centered">
|
||||
{{ account }}
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -8,12 +8,8 @@
|
|||
{% block view_content %}
|
||||
<div class="card">
|
||||
<div class="card-content has-text-centered">
|
||||
<h1 class="is-size-1 has-text-weight-bold">
|
||||
{{ account.code }}: {{ account.name }}
|
||||
</h1>
|
||||
<h2 class="is-size-2 has-text-weight-light">
|
||||
{% trans 'Account Transaction List Report' %}
|
||||
</h2>
|
||||
<h1 class="is-size-1 has-text-weight-bold">{{ account.code }}: {{ account.name }}</h1>
|
||||
<h2 class="is-size-2 has-text-weight-light">{% trans 'Account Transaction List Report' %}</h2>
|
||||
<h3 class="is-size-4 is-italic has-font-weight-light">
|
||||
{% if view_date %}
|
||||
{{ from_date | date:'m/d/Y' }}
|
||||
|
|
|
|||
|
|
@ -24,21 +24,13 @@
|
|||
<div class="columns">
|
||||
<div class="column">
|
||||
{% if entity %}
|
||||
<h1 class="is-size-2 has-text-weight-light">
|
||||
{% session_entity_name %}
|
||||
</h1>
|
||||
<h1 class="is-size-2 has-text-weight-light">{% session_entity_name %}</h1>
|
||||
{% elif ledger %}
|
||||
<h1 class="is-size-2 has-text-weight-light">
|
||||
{{ ledger.name }}
|
||||
</h1>
|
||||
<h1 class="is-size-2 has-text-weight-light">{{ ledger.name }}</h1>
|
||||
{% elif unit_model %}
|
||||
<h1 class="is-size-2 has-text-weight-light">
|
||||
{{ ledger.name }}
|
||||
</h1>
|
||||
<h1 class="is-size-2 has-text-weight-light">{{ ledger.name }}</h1>
|
||||
{% endif %}
|
||||
<h1 class="is-size-2 has-text-weight-bold">
|
||||
{% trans 'Balance Sheet' %}
|
||||
</h1>
|
||||
<h1 class="is-size-2 has-text-weight-bold">{% trans 'Balance Sheet' %}</h1>
|
||||
{% if unit_model %}
|
||||
<h3 class="is-size-4 has-text-weight-medium is-italic">
|
||||
{{ unit_model.name }} {% trans 'Unit' %}
|
||||
|
|
|
|||
|
|
@ -8,9 +8,7 @@
|
|||
<div class="column">
|
||||
<a class="button is-primary is-outlined is-small"
|
||||
href="{% url 'django_ledger:bank-account-create' entity_slug=view.kwargs.entity_slug %}">
|
||||
<span class="icon is-large has-text-success">
|
||||
{% icon 'carbon:add-alt' 24 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-success">{% icon 'carbon:add-alt' 24 %}</span>
|
||||
<span>{% trans 'New Bank Account' %}</span>
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -9,9 +9,7 @@
|
|||
{% if po_model %}
|
||||
<div class="column is-12 has-text-centered">
|
||||
<h2 class="title">{% trans 'Bill for' %} {{ po_model.po_number }}</h2>
|
||||
<h3 class="subtitle has-text-weight-light">
|
||||
{% trans 'Bill for' %} {{ po_model.po_title }}
|
||||
</h3>
|
||||
<h3 class="subtitle has-text-weight-light">{% trans 'Bill for' %} {{ po_model.po_title }}</h3>
|
||||
{% for po_item in po_items %}
|
||||
<p>
|
||||
{{ po_item }}
|
||||
|
|
|
|||
|
|
@ -28,9 +28,7 @@
|
|||
class="button is-primary">
|
||||
{% trans 'Go Back' %}
|
||||
</a>
|
||||
<button type="submit" class="button is-danger">
|
||||
{% trans 'Delete' %}
|
||||
</button>
|
||||
<button type="submit" class="button is-danger">{% trans 'Delete' %}</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -139,12 +139,8 @@
|
|||
<th></th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th>
|
||||
{% trans 'Total' %}
|
||||
</th>
|
||||
<th>
|
||||
{% currency_symbol %}{{ total_amount_due | currency_format }}
|
||||
</th>
|
||||
<th>{% trans 'Total' %}</th>
|
||||
<th>{% currency_symbol %}{{ total_amount_due | currency_format }}</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</tfoot>
|
||||
|
|
|
|||
|
|
@ -9,25 +9,19 @@
|
|||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
{% if month %}
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
{{ month | date:'F Y' }}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-thin">{{ month | date:'F Y' }}</h1>
|
||||
{% elif year %}
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
Year {{ year | date:'Y' }}
|
||||
Bills
|
||||
</h1>
|
||||
{% else %}
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
{% trans 'Latest Bills' %}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-thin">{% trans 'Latest Bills' %}</h1>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="level-item">
|
||||
<a href="{% url 'django_ledger:bill-create' entity_slug=view.kwargs.entity_slug %}">
|
||||
<span class="icon is-large has-text-success">
|
||||
{% icon 'carbon:add-alt' 60 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-success">{% icon 'carbon:add-alt' 60 %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,9 +25,7 @@
|
|||
class="button is-primary">
|
||||
{% trans 'Go Back' %}
|
||||
</a>
|
||||
<button type="submit" class="button is-warning">
|
||||
{% trans 'Void' %}
|
||||
</button>
|
||||
<button type="submit" class="button is-warning">{% trans 'Void' %}</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -8,9 +8,7 @@
|
|||
<div class="column">
|
||||
<a class="button is-primary is-outlined is-small"
|
||||
href="{% url 'django_ledger:customer-create' entity_slug=view.kwargs.entity_slug %}">
|
||||
<span class="icon is-large has-text-success">
|
||||
{% icon 'carbon:add-alt' 24 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-success">{% icon 'carbon:add-alt' 24 %}</span>
|
||||
<span>{% trans 'New Customer' %}</span>
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -14,9 +14,7 @@
|
|||
{% data_import_job_txs_imported %}
|
||||
</div>
|
||||
<div class="column is-12 has-text-centered">
|
||||
<a class="button is-dark" href="{% url ">
|
||||
Back
|
||||
</a>
|
||||
<a class="button is-dark" href="{% url ">Back</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -23,9 +23,7 @@
|
|||
<a href="{{ entity.get_absolute_url }}" class="button is-primary">
|
||||
{% trans 'Go Back' %}
|
||||
</a>
|
||||
<button type="submit" class="button is-danger">
|
||||
{% trans 'Delete' %}
|
||||
</button>
|
||||
<button type="submit" class="button is-danger">{% trans 'Delete' %}</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -8,15 +8,11 @@
|
|||
<div class="level">
|
||||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
{% trans 'The Things I Pay For' %}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-thin">{% trans 'The Things I Pay For' %}</h1>
|
||||
</div>
|
||||
<div class="level-item">
|
||||
<a href="{% url 'django_ledger:expense-create' entity_slug=view.kwargs.entity_slug %}">
|
||||
<span class="icon is-large has-text-success">
|
||||
{% icon 'carbon:add-alt' 60 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-success">{% icon 'carbon:add-alt' 60 %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -14,9 +14,7 @@
|
|||
<div class="column is-6-tablet has-text-centered">
|
||||
<div class="box">
|
||||
<a href="{% url 'django_ledger:entity-create' %}">
|
||||
<span class="icon is-large has-text-grey">
|
||||
{% icon "ic:baseline-add-circle-outline" 48 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-grey">{% icon "ic:baseline-add-circle-outline" 48 %}</span>
|
||||
</a>
|
||||
<h2 class="is-size-3">{% trans 'New Entity' %}</h2>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -30,9 +30,7 @@
|
|||
{% else %}
|
||||
<p>
|
||||
Is Progressible:
|
||||
<span class="icon is-small has-text-danger">
|
||||
{% icon 'maki:roadblock-11' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-danger">{% icon 'maki:roadblock-11' 24 %}</span>
|
||||
{% endif %}
|
||||
<p class="is-size-5 has-text-danger">
|
||||
You Still Owe:
|
||||
|
|
@ -123,9 +121,7 @@
|
|||
{% else %}
|
||||
<p>
|
||||
Is Accrued:
|
||||
<span class="icon is-small has-text-danger">
|
||||
{% icon 'maki:roadblock-11' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-danger">{% icon 'maki:roadblock-11' 24 %}</span>
|
||||
</p>
|
||||
{% endif %}
|
||||
<p>
|
||||
|
|
@ -178,12 +174,8 @@
|
|||
{% else %}
|
||||
<div class="box has-text-centered">
|
||||
<a href="{% url 'django_ledger:bill-create' entity_slug=entity_slug %}">
|
||||
<span class="icon is-large has-text-grey">
|
||||
{% icon "ic:baseline-add-circle-outline" 48 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-grey">{% icon "ic:baseline-add-circle-outline" 48 %}</span>
|
||||
</a>
|
||||
<h2 class="is-size-3 has-text-grey">
|
||||
{% trans 'New Bill' %}
|
||||
</h2>
|
||||
<h2 class="is-size-3 has-text-grey">{% trans 'New Bill' %}</h2>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -31,9 +31,7 @@
|
|||
{% else %}
|
||||
<p>
|
||||
Is Progressible:
|
||||
<span class="icon is-small has-text-danger">
|
||||
{% icon 'maki:roadblock-11' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-danger">{% icon 'maki:roadblock-11' 24 %}</span>
|
||||
{% endif %}
|
||||
<p class="is-size-5 has-text-success">
|
||||
Owed to You: {% currency_symbol %}{{ invoice.get_amount_open | currency_format }}
|
||||
|
|
@ -118,9 +116,7 @@
|
|||
{% else %}
|
||||
<p>
|
||||
Is Progressible:
|
||||
<span class="icon is-small has-text-danger">
|
||||
{% icon 'maki:roadblock-11' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-danger">{% icon 'maki:roadblock-11' 24 %}</span>
|
||||
</p>
|
||||
{% endif %}
|
||||
<p>
|
||||
|
|
@ -158,12 +154,8 @@
|
|||
{% else %}
|
||||
<div class="box has-text-centered">
|
||||
<a href="{% url 'django_ledger:invoice-create' entity_slug=entity_slug %}">
|
||||
<span class="icon is-large has-text-grey">
|
||||
{% icon "ic:baseline-add-circle-outline" 48 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-grey">{% icon "ic:baseline-add-circle-outline" 48 %}</span>
|
||||
</a>
|
||||
<h2 class="is-size-3 has-text-grey">
|
||||
{% trans 'New Invoice' %}
|
||||
</h2>
|
||||
<h2 class="is-size-3 has-text-grey">{% trans 'New Invoice' %}</h2>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -22,9 +22,7 @@
|
|||
{% if po_model.for_inventory %}
|
||||
<span class="icon has-text-success">{% icon 'ant-design:check-circle-filled' 24 %}</span>
|
||||
{% else %}
|
||||
<span class="icon is-small has-text-danger">
|
||||
{% icon 'maki:roadblock-11' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-danger">{% icon 'maki:roadblock-11' 24 %}</span>
|
||||
{% endif %}
|
||||
</h3>
|
||||
<h3 class="is-size-4 has-text-weight-light">
|
||||
|
|
@ -33,9 +31,7 @@
|
|||
<span class="icon has-text-success">{% icon 'ant-design:check-circle-filled' 24 %}</span>
|
||||
{{ po_model.fulfillment_date | date }}
|
||||
{% else %}
|
||||
<span class="icon is-small has-text-danger">
|
||||
{% icon 'maki:roadblock-11' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-danger">{% icon 'maki:roadblock-11' 24 %}</span>
|
||||
{% endif %}
|
||||
</h3>
|
||||
</div>
|
||||
|
|
@ -58,12 +54,8 @@
|
|||
{% else %}
|
||||
<div class="box has-text-centered">
|
||||
<a href="{% url 'django_ledger:po-create' entity_slug=entity_slug %}">
|
||||
<span class="icon is-large has-text-grey">
|
||||
{% icon "ic:baseline-add-circle-outline" 48 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-grey">{% icon "ic:baseline-add-circle-outline" 48 %}</span>
|
||||
</a>
|
||||
<h2 class="is-size-3 has-text-grey">
|
||||
{% trans 'New PO' %}
|
||||
</h2>
|
||||
<h2 class="is-size-3 has-text-grey">{% trans 'New PO' %}</h2>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -18,9 +18,7 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
<div class="column is-9">
|
||||
<h1 class="title has-text-weight-light">
|
||||
{{ header_title }}
|
||||
</h1>
|
||||
<h1 class="title has-text-weight-light">{{ header_title }}</h1>
|
||||
{% if header_subtitle %}<h2 class="subtitle">{{ header_subtitle }}</h2>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -24,22 +24,16 @@
|
|||
<div class="columns">
|
||||
<div class="column">
|
||||
{% if entity %}
|
||||
<h1 class="is-size-2 has-text-weight-light">
|
||||
{% session_entity_name %}
|
||||
</h1>
|
||||
<h1 class="is-size-2 has-text-weight-light">{% session_entity_name %}</h1>
|
||||
{% elif ledger %}
|
||||
<h1 class="is-size-2 has-text-weight-light">
|
||||
{{ ledger.name }}
|
||||
</h1>
|
||||
<h1 class="is-size-2 has-text-weight-light">{{ ledger.name }}</h1>
|
||||
{% endif %}
|
||||
{% if unit_model %}
|
||||
<h3 class="is-size-4 has-text-weight-medium is-italic">
|
||||
{{ unit_model.name }} {% trans 'Unit' %}
|
||||
</h3>
|
||||
{% endif %}
|
||||
<h1 class="is-size-2 has-text-weight-bold">
|
||||
{% trans 'Income Statement' %}
|
||||
</h1>
|
||||
<h1 class="is-size-2 has-text-weight-bold">{% trans 'Income Statement' %}</h1>
|
||||
<h2 class="is-size-2 has-text-weight-light">
|
||||
{% if quarter %}
|
||||
{{ year }} | Q{{ quarter }}
|
||||
|
|
|
|||
|
|
@ -8,15 +8,11 @@
|
|||
<div class="level">
|
||||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
{% trans 'My Inventory Items' %}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-thin">{% trans 'My Inventory Items' %}</h1>
|
||||
</div>
|
||||
<div class="level-item">
|
||||
<a href="{% url 'django_ledger:inventory-item-create' entity_slug=view.kwargs.entity_slug %}">
|
||||
<span class="icon is-large has-text-success">
|
||||
{% icon 'carbon:add-alt' 60 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-success">{% icon 'carbon:add-alt' 60 %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -26,9 +26,7 @@
|
|||
class="button is-primary">
|
||||
{% trans 'Go Back' %}
|
||||
</a>
|
||||
<button type="submit" class="button is-danger">
|
||||
{% trans 'Delete' %}
|
||||
</button>
|
||||
<button type="submit" class="button is-danger">{% trans 'Delete' %}</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -124,12 +124,8 @@
|
|||
<tr>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th>
|
||||
{% trans 'Total' %}
|
||||
</th>
|
||||
<th>
|
||||
{% currency_symbol %}{{ total_amount_due | currency_format }}
|
||||
</th>
|
||||
<th>{% trans 'Total' %}</th>
|
||||
<th>{% currency_symbol %}{{ total_amount_due | currency_format }}</th>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -9,25 +9,19 @@
|
|||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
{% if month %}
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
{{ month | date:'F Y' }}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-thin">{{ month | date:'F Y' }}</h1>
|
||||
{% elif year %}
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
Year {{ year | date:'Y' }}
|
||||
{% trans 'Invoices' %}
|
||||
</h1>
|
||||
{% else %}
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
{% trans 'Latest Invoices' %}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-thin">{% trans 'Latest Invoices' %}</h1>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="level-item">
|
||||
<a href="{% url 'django_ledger:invoice-create' entity_slug=view.kwargs.entity_slug %}">
|
||||
<span class="icon is-large has-text-success">
|
||||
{% icon 'carbon:add-alt' 60 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-success">{% icon 'carbon:add-alt' 60 %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -153,9 +153,7 @@
|
|||
{% if invoice.ledger.posted %}
|
||||
<span class="icon has-text-success">{% icon 'ant-design:check-circle-filled' 24 %}</span>
|
||||
{% else %}
|
||||
<span class="icon is-small has-text-danger">
|
||||
{% icon 'maki:roadblock-11' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-danger">{% icon 'maki:roadblock-11' 24 %}</span>
|
||||
{% endif %}
|
||||
</p>
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -8,15 +8,11 @@
|
|||
<div class="level">
|
||||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
{% trans 'Products & Services List' %}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-thin">{% trans 'Products & Services List' %}</h1>
|
||||
</div>
|
||||
<div class="level-item">
|
||||
<a href="{% url 'django_ledger:product-create' entity_slug=view.kwargs.entity_slug %}">
|
||||
<span class="icon is-large has-text-success">
|
||||
{% icon 'carbon:add-alt' 60 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-success">{% icon 'carbon:add-alt' 60 %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -26,9 +26,7 @@
|
|||
class="button is-primary">
|
||||
{% trans 'Go Back' %}
|
||||
</a>
|
||||
<button type="submit" class="button is-danger">
|
||||
{% trans 'Delete' %}
|
||||
</button>
|
||||
<button type="submit" class="button is-danger">{% trans 'Delete' %}</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -45,9 +45,7 @@
|
|||
</nav>
|
||||
<div class="columns is-multiline">
|
||||
<div class="column is-12">
|
||||
<h3 class="is-size-3 has-text-weight-light">
|
||||
{{ po_model.po_title }}
|
||||
</h3>
|
||||
<h3 class="is-size-3 has-text-weight-light">{{ po_model.po_title }}</h3>
|
||||
</div>
|
||||
<div class="column is-12">
|
||||
<div class="table-container">
|
||||
|
|
@ -89,9 +87,7 @@
|
|||
<tr>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>
|
||||
Total PO Amount
|
||||
</td>
|
||||
<td>Total PO Amount</td>
|
||||
<td class="has-text-weight-bold">
|
||||
{% currency_symbol %}{{ total_amount_due | currency_format }}
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -9,25 +9,19 @@
|
|||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
{% if month %}
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
{{ month | date:'F Y' }}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-thin">{{ month | date:'F Y' }}</h1>
|
||||
{% elif year %}
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
Year {{ year | date:'Y' }}
|
||||
Bills
|
||||
</h1>
|
||||
{% else %}
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
{% trans 'Latest Purchase Orders' %}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-thin">{% trans 'Latest Purchase Orders' %}</h1>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="level-item">
|
||||
<a href="{% url 'django_ledger:po-create' entity_slug=view.kwargs.entity_slug %}">
|
||||
<span class="icon is-large has-text-success">
|
||||
{% icon 'carbon:add-alt' 60 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-success">{% icon 'carbon:add-alt' 60 %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,9 +5,7 @@
|
|||
{% block view_content %}
|
||||
<div class="columns">
|
||||
<div class="column has-text-centered is-12">
|
||||
<h1 class="is-size-1 has-text-weight-light">
|
||||
{% trans 'Update Purchase Order' %}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-light">{% trans 'Update Purchase Order' %}</h1>
|
||||
<h2 class="title">{{ po_model.po_number }}</h2>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -62,9 +60,7 @@
|
|||
<div class="field">
|
||||
<label for="{{ form.markdown_notes.id_for_label }}" class="label">
|
||||
{{ form.markdown_notes.label }}
|
||||
<span class="icon is-medium has-text-grey">
|
||||
{% icon 'logos:markdown' 16 %}
|
||||
</span>
|
||||
<span class="icon is-medium has-text-grey">{% icon 'logos:markdown' 16 %}</span>
|
||||
</label>
|
||||
{{ form.markdown_notes }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,15 +8,11 @@
|
|||
<div class="level">
|
||||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
{% trans 'Products & Services List' %}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-thin">{% trans 'Products & Services List' %}</h1>
|
||||
</div>
|
||||
<div class="level-item">
|
||||
<a href="{% url 'django_ledger:product-create' entity_slug=view.kwargs.entity_slug %}">
|
||||
<span class="icon is-large has-text-success">
|
||||
{% icon 'carbon:add-alt' 60 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-success">{% icon 'carbon:add-alt' 60 %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -6,9 +6,7 @@
|
|||
{% if title %}
|
||||
<tr>
|
||||
<td>
|
||||
<h2 class="is-size-3 has-text-weight-light">
|
||||
{{ title }}
|
||||
</h2>
|
||||
<h2 class="is-size-3 has-text-weight-light">{{ title }}</h2>
|
||||
</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
|
|
@ -23,65 +21,37 @@
|
|||
<th>{% trans 'Role' %}</th>
|
||||
<th>{% trans 'Parent' %}</th>
|
||||
<th>{% trans 'Code' %}</th>
|
||||
<th>
|
||||
{% trans 'Account Name' %}
|
||||
</th>
|
||||
<th>
|
||||
{% trans 'Balance Type' %}
|
||||
</th>
|
||||
<th>
|
||||
{% trans 'Active' %}
|
||||
</th>
|
||||
<th>
|
||||
{% trans 'Locked' %}
|
||||
</th>
|
||||
<th>
|
||||
{% trans 'Actions' %}
|
||||
</th>
|
||||
<th>{% trans 'Account Name' %}</th>
|
||||
<th>{% trans 'Balance Type' %}</th>
|
||||
<th>{% trans 'Active' %}</th>
|
||||
<th>{% trans 'Locked' %}</th>
|
||||
<th>{% trans 'Actions' %}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for account in accounts %}
|
||||
<tr>
|
||||
<td>
|
||||
{{ account.get_role_display }}
|
||||
</td>
|
||||
<td>
|
||||
{{ account.parent.code }}
|
||||
</td>
|
||||
<td>
|
||||
{{ account.code }}
|
||||
</td>
|
||||
<td>
|
||||
{{ account.name }}
|
||||
</td>
|
||||
<td>{{ account.get_role_display }}</td>
|
||||
<td>{{ account.parent.code }}</td>
|
||||
<td>{{ account.code }}</td>
|
||||
<td>{{ account.name }}</td>
|
||||
<td class="has-text-centered">
|
||||
{% if account.is_debit %}
|
||||
<span class="icon has-text-info-dark">
|
||||
{% icon 'bi:arrow-bar-down' 24 %}
|
||||
</span>
|
||||
<span class="icon has-text-info-dark">{% icon 'bi:arrow-bar-down' 24 %}</span>
|
||||
{% elif account.is_credit %}
|
||||
<span class="icon has-text-warning-dark">
|
||||
{% icon 'bi:arrow-bar-up' 24 %}
|
||||
</span>
|
||||
<span class="icon has-text-warning-dark">{% icon 'bi:arrow-bar-up' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="has-text-centered">
|
||||
{% if account.active %}
|
||||
<span class="icon has-text-success-dark">
|
||||
{% icon 'ant-design:check-circle-filled' 24 %}
|
||||
</span>
|
||||
<span class="icon has-text-success-dark">{% icon 'ant-design:check-circle-filled' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="has-text-centered">
|
||||
{% if account.locked %}
|
||||
<span class="icon has-text-success-dark">
|
||||
{% icon 'bi:lock-fill' 24 %}
|
||||
</span>
|
||||
<span class="icon has-text-success-dark">{% icon 'bi:lock-fill' 24 %}</span>
|
||||
{% elif not account.locked %}
|
||||
<span class="icon has-text-danger-dark">
|
||||
{% icon 'bx:bx-lock-open-alt' 24 %}
|
||||
</span>
|
||||
<span class="icon has-text-danger-dark">{% icon 'bx:bx-lock-open-alt' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
|
|
@ -90,9 +60,7 @@
|
|||
<button class="button is-small is-rounded is-outlined"
|
||||
aria-haspopup="true"
|
||||
aria-controls="dropdown-menu">
|
||||
<span>
|
||||
Actions
|
||||
</span>
|
||||
<span>Actions</span>
|
||||
<span class="icon is-small">{% icon 'bi:arrow-down' 24 %}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -27,9 +27,7 @@
|
|||
{% for acc in tx_digest.group_account.GROUP_ASSETS %}
|
||||
<tr>
|
||||
<td>{{ acc.code }}</td>
|
||||
<td>
|
||||
{{ acc.name }}
|
||||
</td>
|
||||
<td>{{ acc.name }}</td>
|
||||
{% if by_unit %}
|
||||
<td>
|
||||
{% if acc.unit_name %}{{ acc.unit_name }}{% endif %}
|
||||
|
|
@ -42,15 +40,11 @@
|
|||
<span class="icon">{% icon 'bi:arrow-bar-up' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% currency_symbol %}{{ acc.balance | currency_format }}
|
||||
</td>
|
||||
<td>{% currency_symbol %}{{ acc.balance | currency_format }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
<tr class="has-text-weight-bold">
|
||||
<td>
|
||||
{% trans 'Total Assets' %}
|
||||
</td>
|
||||
<td>{% trans 'Total Assets' %}</td>
|
||||
<td></td>
|
||||
{% if by_unit %}<td></td>{% endif %}
|
||||
<td></td>
|
||||
|
|
@ -70,12 +64,8 @@
|
|||
{# LIABILITIES #}
|
||||
{% for acc in tx_digest.group_account.GROUP_LIABILITIES %}
|
||||
<tr>
|
||||
<td>
|
||||
{{ acc.code }}
|
||||
</td>
|
||||
<td>
|
||||
{{ acc.name }}
|
||||
</td>
|
||||
<td>{{ acc.code }}</td>
|
||||
<td>{{ acc.name }}</td>
|
||||
{% if by_unit %}
|
||||
<td>
|
||||
{% if acc.unit_name %}{{ acc.unit_name }}{% endif %}
|
||||
|
|
@ -88,15 +78,11 @@
|
|||
<span class="icon">{% icon 'bi:arrow-bar-up' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% currency_symbol %}{{ acc.balance | currency_format }}
|
||||
</td>
|
||||
<td>{% currency_symbol %}{{ acc.balance | currency_format }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
<tr class="has-text-weight-bold">
|
||||
<td>
|
||||
{% trans 'Total Liabilities' %}
|
||||
</td>
|
||||
<td>{% trans 'Total Liabilities' %}</td>
|
||||
<td></td>
|
||||
{% if by_unit %}<td></td>{% endif %}
|
||||
<td></td>
|
||||
|
|
|
|||
|
|
@ -25,9 +25,7 @@
|
|||
{% if bank_acc.active %}
|
||||
<span class="icon has-text-success">{% icon 'ant-design:check-circle-filled' 24 %}</span>
|
||||
{% else %}
|
||||
<span class="icon is-small has-text-danger">
|
||||
{% icon 'maki:roadblock-11' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-danger">{% icon 'maki:roadblock-11' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
|
|
|
|||
|
|
@ -30,12 +30,8 @@
|
|||
{% endfor %}
|
||||
{{ f.item_model }}
|
||||
</td>
|
||||
<td id="{{ f.instance.html_id_unit_cost }}">
|
||||
{{ f.unit_cost }}
|
||||
</td>
|
||||
<td id="{{ f.instance.html_id_quantity }}">
|
||||
{{ f.quantity }}
|
||||
</td>
|
||||
<td id="{{ f.instance.html_id_unit_cost }}">{{ f.unit_cost }}</td>
|
||||
<td id="{{ f.instance.html_id_quantity }}">{{ f.quantity }}</td>
|
||||
<td>{{ f.entity_unit }}</td>
|
||||
<td class="has-text-right" id="{{ f.instance.html_id_total_amount }}">
|
||||
{% currency_symbol %}{{ f.instance.total_amount | currency_format }}
|
||||
|
|
|
|||
|
|
@ -19,35 +19,21 @@
|
|||
<tr>
|
||||
<td>{{ bill.bill_number }}</td>
|
||||
<td>{{ bill.date }}</td>
|
||||
<td>
|
||||
{{ bill.vendor.vendor_name }}
|
||||
</td>
|
||||
<td>
|
||||
${{ bill.amount_due | currency_format }}
|
||||
</td>
|
||||
<td>
|
||||
${{ bill.amount_paid | currency_format }}
|
||||
</td>
|
||||
<td>{{ bill.vendor.vendor_name }}</td>
|
||||
<td>${{ bill.amount_due | currency_format }}</td>
|
||||
<td>${{ bill.amount_paid | currency_format }}</td>
|
||||
<td class="has-text-centered">
|
||||
{% if bill.paid %}
|
||||
<span class="icon is-small has-text-success">
|
||||
{% icon 'bi:check-circle-fill' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-success">{% icon 'bi:check-circle-fill' 24 %}</span>
|
||||
{% else %}
|
||||
<span class="icon is-small has-text-danger">
|
||||
{% icon 'clarity:no-access-solid' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-danger">{% icon 'clarity:no-access-solid' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="has-text-centered">
|
||||
{% if bill.is_past_due %}
|
||||
<span class="icon is-small has-text-success">
|
||||
{% icon 'bi:check-circle-fill' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-success">{% icon 'bi:check-circle-fill' 24 %}</span>
|
||||
{% else %}
|
||||
<span class="icon is-small has-text-danger">
|
||||
{% icon 'clarity:no-access-solid' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-danger">{% icon 'clarity:no-access-solid' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="has-text-centered">
|
||||
|
|
@ -56,9 +42,7 @@
|
|||
<button class="button is-small is-rounded is-outlined is-dark"
|
||||
aria-haspopup="true"
|
||||
aria-controls="dropdown-menu">
|
||||
<span>
|
||||
Actions
|
||||
</span>
|
||||
<span>Actions</span>
|
||||
<span class="icon is-small">{% icon 'bi:arrow-down' 24 %}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -37,9 +37,7 @@
|
|||
aria-haspopup="true"
|
||||
onclick="djLedger.toggleDropdown('customer-action-{{ job.uuid }}')"
|
||||
aria-controls="dropdown-menu">
|
||||
<span>
|
||||
Actions
|
||||
</span>
|
||||
<span>Actions</span>
|
||||
<span class="icon is-small">{% icon 'bi:arrow-down' 24 %}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -38,9 +38,7 @@
|
|||
</div>
|
||||
</section>
|
||||
<footer class="modal-card-foot">
|
||||
<button type="submit" class="button is-success">
|
||||
Submit
|
||||
</button>
|
||||
<button type="submit" class="button is-success">Submit</button>
|
||||
<button class="button" onclick="djLedger.toggleModal('{{ bug_modal_html_id }}')">
|
||||
Cancel
|
||||
</button>
|
||||
|
|
@ -75,9 +73,7 @@
|
|||
</div>
|
||||
</section>
|
||||
<footer class="modal-card-foot">
|
||||
<button type="submit" class="button is-success">
|
||||
Send
|
||||
</button>
|
||||
<button type="submit" class="button is-success">Send</button>
|
||||
<button class="button" onclick="djLedger.toggleModal('{{ feature_modal_html_id }}')">
|
||||
Cancel
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -21,9 +21,7 @@
|
|||
{% for acc in tx_digest.group_account.GROUP_INCOME %}
|
||||
<tr>
|
||||
<td>{{ acc.code }}</td>
|
||||
<td>
|
||||
{{ acc.name }}
|
||||
</td>
|
||||
<td>{{ acc.name }}</td>
|
||||
{% if by_unit %}
|
||||
<td>
|
||||
{% if acc.unit_name %}{{ acc.unit_name }}{% endif %}
|
||||
|
|
@ -36,15 +34,11 @@
|
|||
<span class="icon">{% icon 'bi:arrow-bar-up' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% currency_symbol %}{{ acc.balance | currency_format }}
|
||||
</td>
|
||||
<td>{% currency_symbol %}{{ acc.balance | currency_format }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
<tr class="has-text-weight-bold">
|
||||
<td>
|
||||
Total Income
|
||||
</td>
|
||||
<td>Total Income</td>
|
||||
<td></td>
|
||||
{% if by_unit %}<td></td>{% endif %}
|
||||
<td></td>
|
||||
|
|
@ -63,12 +57,8 @@
|
|||
</tr>
|
||||
{% for acc in tx_digest.group_account.GROUP_EXPENSES %}
|
||||
<tr>
|
||||
<td>
|
||||
{{ acc.code }}
|
||||
</td>
|
||||
<td>
|
||||
{{ acc.name }}
|
||||
</td>
|
||||
<td>{{ acc.code }}</td>
|
||||
<td>{{ acc.name }}</td>
|
||||
{% if by_unit %}
|
||||
<td>
|
||||
{% if acc.unit_name %}{{ acc.unit_name }}{% endif %}
|
||||
|
|
@ -81,15 +71,11 @@
|
|||
<span class="icon">{% icon 'bi:arrow-bar-up' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% currency_symbol %}{{ acc.balance | reverse_sing | currency_format }}
|
||||
</td>
|
||||
<td>{% currency_symbol %}{{ acc.balance | reverse_sing | currency_format }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
<tr class="has-text-weight-bold">
|
||||
<td>
|
||||
Total Expenses
|
||||
</td>
|
||||
<td>Total Expenses</td>
|
||||
<td></td>
|
||||
{% if by_unit %}<td></td>{% endif %}
|
||||
<td></td>
|
||||
|
|
|
|||
|
|
@ -30,12 +30,8 @@
|
|||
{% endfor %}
|
||||
{{ f.item_model }}
|
||||
</td>
|
||||
<td id="{{ f.instance.html_id_unit_cost }}">
|
||||
{{ f.unit_cost }}
|
||||
</td>
|
||||
<td id="{{ f.instance.html_id_quantity }}">
|
||||
{{ f.quantity }}
|
||||
</td>
|
||||
<td id="{{ f.instance.html_id_unit_cost }}">{{ f.unit_cost }}</td>
|
||||
<td id="{{ f.instance.html_id_quantity }}">{{ f.quantity }}</td>
|
||||
<td class="has-text-right" id="{{ f.instance.html_id_total_amount }}">
|
||||
{% currency_symbol %}{{ f.instance.total_amount | currency_format }}
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -19,35 +19,21 @@
|
|||
<tr>
|
||||
<td>{{ invoice.invoice_number }}</td>
|
||||
<td>{{ invoice.date }}</td>
|
||||
<td>
|
||||
{{ invoice.customer.customer_name }}
|
||||
</td>
|
||||
<td>
|
||||
${{ invoice.amount_due | currency_format }}
|
||||
</td>
|
||||
<td>
|
||||
${{ invoice.amount_paid | currency_format }}
|
||||
</td>
|
||||
<td>{{ invoice.customer.customer_name }}</td>
|
||||
<td>${{ invoice.amount_due | currency_format }}</td>
|
||||
<td>${{ invoice.amount_paid | currency_format }}</td>
|
||||
<td>
|
||||
{% if invoice.paid %}
|
||||
<span class="icon is-small has-text-success">
|
||||
{% icon 'bi:check-circle-fill' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-success">{% icon 'bi:check-circle-fill' 24 %}</span>
|
||||
{% else %}
|
||||
<span class="icon is-small has-text-danger">
|
||||
{% icon 'clarity:no-access-solid' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-danger">{% icon 'clarity:no-access-solid' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if invoice.is_past_due %}
|
||||
<span class="icon is-small has-text-success">
|
||||
{% icon 'bi:check-circle-fill' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-success">{% icon 'bi:check-circle-fill' 24 %}</span>
|
||||
{% else %}
|
||||
<span class="icon is-small has-text-danger">
|
||||
{% icon 'clarity:no-access-solid' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-danger">{% icon 'clarity:no-access-solid' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
|
|
@ -56,9 +42,7 @@
|
|||
<button class="button is-small is-rounded is-outlined is-dark"
|
||||
aria-haspopup="true"
|
||||
aria-controls="dropdown-menu">
|
||||
<span>
|
||||
{% trans 'Actions' %}
|
||||
</span>
|
||||
<span>{% trans 'Actions' %}</span>
|
||||
<span class="icon is-small">{% icon 'bi:arrow-down' 24 %}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -22,34 +22,24 @@
|
|||
{% if je.posted %}
|
||||
<span class="icon has-text-success">{% icon 'ant-design:check-circle-filled' 24 %}</span>
|
||||
{% else %}
|
||||
<span class="icon is-small has-text-danger">
|
||||
{% icon 'maki:roadblock-11' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-danger">{% icon 'maki:roadblock-11' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if je.locked %}
|
||||
<span class="icon has-text-success-dark">
|
||||
{% icon 'bi:lock-fill' 24 %}
|
||||
</span>
|
||||
<span class="icon has-text-success-dark">{% icon 'bi:lock-fill' 24 %}</span>
|
||||
{% else %}
|
||||
<span class="icon has-text-danger-dark">
|
||||
{% icon 'bx:bx-lock-open-alt' 24 %}
|
||||
</span>
|
||||
<span class="icon has-text-danger-dark">{% icon 'bx:bx-lock-open-alt' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{{ je.created | timesince }}
|
||||
</td>
|
||||
<td>{{ je.created | timesince }}</td>
|
||||
<td>
|
||||
<div class="dropdown is-right is-hoverable" id="je-action-{{ je.uuid }}">
|
||||
<div class="dropdown-trigger">
|
||||
<button class="button is-small is-rounded is-outlined is-dark"
|
||||
aria-haspopup="true"
|
||||
aria-controls="dropdown-menu">
|
||||
<span>
|
||||
Actions
|
||||
</span>
|
||||
<span>Actions</span>
|
||||
<span class="icon is-small">{% icon 'bi:arrow-down' 24 %}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -42,9 +42,7 @@
|
|||
{% if ledger.posted %}
|
||||
<span class="icon has-text-success">{% icon 'ant-design:check-circle-filled' 24 %}</span>
|
||||
{% else %}
|
||||
<span class="icon is-small has-text-danger">
|
||||
{% icon 'maki:roadblock-11' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-danger">{% icon 'maki:roadblock-11' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
|
|
|
|||
|
|
@ -44,9 +44,7 @@
|
|||
<a class="navbar-link">{{ link.title }}</a>
|
||||
<div class="navbar-dropdown">
|
||||
{% for l in link.links %}
|
||||
<a class="navbar-item" href="{{ l.url }}">
|
||||
{{ l.title }}
|
||||
</a>
|
||||
<a class="navbar-item" href="{{ l.url }}">{{ l.title }}</a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -19,18 +19,14 @@
|
|||
<td>{{ pns.uom }}</td>
|
||||
<td>{{ pns.sku }}</td>
|
||||
<td>{{ pns.upc }}</td>
|
||||
<td>
|
||||
{{ pns.earnings_account }}
|
||||
</td>
|
||||
<td>{{ pns.earnings_account }}</td>
|
||||
<td>
|
||||
<div class="dropdown is-right is-hoverable" id="invoice-action-{{ invoice.uuid }}">
|
||||
<div class="dropdown-trigger">
|
||||
<button class="button is-small is-rounded is-outlined is-dark"
|
||||
aria-haspopup="true"
|
||||
aria-controls="dropdown-menu">
|
||||
<span>
|
||||
Actions
|
||||
</span>
|
||||
<span>Actions</span>
|
||||
<span class="icon is-small">{% icon 'bi:arrow-down' 24 %}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -35,12 +35,8 @@
|
|||
{{ f.item_model }}
|
||||
{% if f.errors %}{{ f.errors }}{% endif %}
|
||||
</td>
|
||||
<td id="{{ f.instance.html_id_unit_cost }}">
|
||||
{{ f.unit_cost }}
|
||||
</td>
|
||||
<td id="{{ f.instance.html_id_quantity }}">
|
||||
{{ f.quantity }}
|
||||
</td>
|
||||
<td id="{{ f.instance.html_id_unit_cost }}">{{ f.unit_cost }}</td>
|
||||
<td id="{{ f.instance.html_id_quantity }}">{{ f.quantity }}</td>
|
||||
<td>{{ f.entity_unit }}</td>
|
||||
<td class="has-text-right" id="{{ f.instance.html_id_total_amount }}">
|
||||
{% currency_symbol %}{{ f.instance.total_amount | currency_format }}
|
||||
|
|
|
|||
|
|
@ -19,24 +19,18 @@
|
|||
<td>{{ po.po_number }}</td>
|
||||
<td>{{ po.po_title }}</td>
|
||||
<td>{{ po.po_date }}</td>
|
||||
<td>
|
||||
{{ po.get_po_status_display }}
|
||||
</td>
|
||||
<td>{{ po.get_po_status_display }}</td>
|
||||
<td>
|
||||
{% if po.fulfillment_date %}{{ po.fulfillment_date }}{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% currency_symbol %}{{ po.po_amount | currency_format }}
|
||||
</td>
|
||||
<td>{% currency_symbol %}{{ po.po_amount | currency_format }}</td>
|
||||
<td class="has-text-centered">
|
||||
<div class="dropdown is-right is-hoverable" id="bill-action-{{ po.uuid }}">
|
||||
<div class="dropdown-trigger">
|
||||
<button class="button is-small is-rounded is-outlined is-dark"
|
||||
aria-haspopup="true"
|
||||
aria-controls="dropdown-menu">
|
||||
<span>
|
||||
Actions
|
||||
</span>
|
||||
<span>Actions</span>
|
||||
<span class="icon is-small">{% icon 'bi:arrow-down' 24 %}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -24,9 +24,7 @@
|
|||
<td>
|
||||
{% if tx.tx_type == 'debit' %}${{ tx.amount | currency_format }}{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{{ tx.description }}
|
||||
</td>
|
||||
<td>{{ tx.description }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
<tr class="has-text-weight-bold">
|
||||
|
|
@ -34,12 +32,8 @@
|
|||
<td></td>
|
||||
<td></td>
|
||||
<td class="has-text-right">Total</td>
|
||||
<td>
|
||||
{% currency_symbol %}{{ total_credits | currency_format }}
|
||||
</td>
|
||||
<td>
|
||||
{% currency_symbol %}{{ total_debits | currency_format }}
|
||||
</td>
|
||||
<td>{% currency_symbol %}{{ total_credits | currency_format }}</td>
|
||||
<td>{% currency_symbol %}{{ total_debits | currency_format }}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -17,13 +17,9 @@
|
|||
<td>{{ uom.unit_abbr }}</td>
|
||||
<td class="has-text-centered">
|
||||
{% if uom.is_active %}
|
||||
<span class="icon is-small has-text-success">
|
||||
{% icon 'bi:check-circle-fill' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-success">{% icon 'bi:check-circle-fill' 24 %}</span>
|
||||
{% else %}
|
||||
<span class="icon is-small has-text-danger">
|
||||
{% icon 'clarity:no-access-solid' 24 %}
|
||||
</span>
|
||||
<span class="icon is-small has-text-danger">{% icon 'clarity:no-access-solid' 24 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
|
|
|
|||
|
|
@ -38,12 +38,8 @@
|
|||
</table>
|
||||
</div>
|
||||
<div class="column is-12 has-text-centered">
|
||||
<button class="button is-primary is-outlined">
|
||||
Save
|
||||
</button>
|
||||
<a class="button is-dark" href="{% url ">
|
||||
Done
|
||||
</a>
|
||||
<button class="button is-primary is-outlined">Save</button>
|
||||
<a class="button is-dark" href="{% url ">Done</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -8,9 +8,7 @@
|
|||
<div class="level">
|
||||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
{% trans 'Create Entity Unit' %}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-thin">{% trans 'Create Entity Unit' %}</h1>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,9 +8,7 @@
|
|||
<div class="level">
|
||||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
{{ unit.name }}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-thin">{{ unit.name }}</h1>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,15 +8,11 @@
|
|||
<div class="level">
|
||||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
{% trans 'Entity Units List' %}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-thin">{% trans 'Entity Units List' %}</h1>
|
||||
</div>
|
||||
<div class="level-item">
|
||||
<a href="{% url 'django_ledger:unit-create' entity_slug=view.kwargs.entity_slug %}">
|
||||
<span class="icon is-large has-text-success">
|
||||
{% icon 'carbon:add-alt' 60 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-success">{% icon 'carbon:add-alt' 60 %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,9 +8,7 @@
|
|||
<div class="level">
|
||||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
{% trans 'Update Entity Unit' %}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-thin">{% trans 'Update Entity Unit' %}</h1>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,15 +8,11 @@
|
|||
<div class="level">
|
||||
<div class="level-left">
|
||||
<div class="level-item">
|
||||
<h1 class="is-size-1 has-text-weight-thin">
|
||||
{% trans 'Unit of Measures List' %}
|
||||
</h1>
|
||||
<h1 class="is-size-1 has-text-weight-thin">{% trans 'Unit of Measures List' %}</h1>
|
||||
</div>
|
||||
<div class="level-item">
|
||||
<a href="{% url 'django_ledger:uom-create' entity_slug=view.kwargs.entity_slug %}">
|
||||
<span class="icon is-large has-text-success">
|
||||
{% icon 'carbon:add-alt' 60 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-success">{% icon 'carbon:add-alt' 60 %}</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,9 +8,7 @@
|
|||
<div class="column">
|
||||
<a class="button is-primary is-outlined is-small"
|
||||
href="{% url 'django_ledger:vendor-create' entity_slug=view.kwargs.entity_slug %}">
|
||||
<span class="icon is-large has-text-success">
|
||||
{% icon 'carbon:add-alt' 24 %}
|
||||
</span>
|
||||
<span class="icon is-large has-text-success">{% icon 'carbon:add-alt' 24 %}</span>
|
||||
<span>{% trans 'New Vendor' %}</span>
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -14,9 +14,7 @@
|
|||
This incident has been logged and will be addressed by an engineer as soon as possible.
|
||||
</p>
|
||||
<p>
|
||||
<a onclick="javascript:history.go(-1);">
|
||||
Return to previous page
|
||||
</a>
|
||||
<a onclick="javascript:history.go(-1);">Return to previous page</a>
|
||||
<br>
|
||||
<a href="{{ homepage_url }}">Go to homepage</a>
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -58,9 +58,7 @@
|
|||
</div>
|
||||
<div class="col-md-4">
|
||||
<h3>
|
||||
<a href="{{ product.get_absolute_url }}">
|
||||
{{ line.description }}
|
||||
</a>
|
||||
<a href="{{ product.get_absolute_url }}">{{ line.description }}</a>
|
||||
</h3>
|
||||
<p class="availability {{ session.availability.code }}">
|
||||
{{ session.availability.message }}
|
||||
|
|
@ -162,9 +160,7 @@
|
|||
{% trans "Add voucher" %}
|
||||
</button>
|
||||
{% trans "or" %}
|
||||
<a href="#" id="voucher_form_cancel">
|
||||
{% trans "cancel" %}
|
||||
</a>
|
||||
<a href="#" id="voucher_form_cancel">{% trans "cancel" %}</a>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -146,9 +146,7 @@
|
|||
<td class="text-right">-{{ shipping_discount|currency:basket.currency }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="total">
|
||||
{% trans "Shipping total (after discounts)" %}
|
||||
</th>
|
||||
<th class="total">{% trans "Shipping total (after discounts)" %}</th>
|
||||
<th class="total text-right">
|
||||
{% if not show_tax_separately and shipping_charge.is_tax_known %}
|
||||
{{ shipping_charge.incl_tax|currency:basket.currency }}
|
||||
|
|
@ -172,9 +170,7 @@
|
|||
</tr>
|
||||
{% for surcharge in surcharges %}
|
||||
<tr>
|
||||
<th class="total">
|
||||
{{ surcharge.surcharge.name }}
|
||||
</th>
|
||||
<th class="total">{{ surcharge.surcharge.name }}</th>
|
||||
<th class="total align-right">
|
||||
{% if not show_tax_separately and surcharge.price.is_tax_known %}
|
||||
{{ surcharge.price.incl_tax|currency:basket.currency }}
|
||||
|
|
@ -189,49 +185,33 @@
|
|||
{% block tax_totals %}
|
||||
{% if show_tax_separately %}
|
||||
<tr>
|
||||
<th>
|
||||
|
||||
</th>
|
||||
<th> </th>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th colspan="2">
|
||||
<h3>
|
||||
{% trans "Tax" %}
|
||||
</h3>
|
||||
<h3>{% trans "Tax" %}</h3>
|
||||
</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="total">
|
||||
{% trans "Basket" %}
|
||||
</th>
|
||||
<th class="total text-right">
|
||||
{{ basket.total_tax|currency:basket.currency }}
|
||||
</th>
|
||||
<th class="total">{% trans "Basket" %}</th>
|
||||
<th class="total text-right">{{ basket.total_tax|currency:basket.currency }}</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="total">
|
||||
{% trans "Shipping" %}
|
||||
</th>
|
||||
<th class="total text-right">
|
||||
{{ shipping_charge.tax|currency:basket.currency }}
|
||||
</th>
|
||||
<th class="total">{% trans "Shipping" %}</th>
|
||||
<th class="total text-right">{{ shipping_charge.tax|currency:basket.currency }}</th>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
{% block post_order_action_totals %}
|
||||
{% if basket.post_order_actions %}
|
||||
<tr>
|
||||
<th>
|
||||
|
||||
</th>
|
||||
<th> </th>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>
|
||||
<h3>
|
||||
{% trans "Post order actions" %}
|
||||
</h3>
|
||||
<h3>{% trans "Post order actions" %}</h3>
|
||||
<small>
|
||||
{% trans "These will be applied once your order is placed." %}
|
||||
</small>
|
||||
|
|
@ -241,9 +221,7 @@
|
|||
{% for discount in basket.post_order_actions %}
|
||||
<tr>
|
||||
<td class="total" colspan="2">
|
||||
<span class="badge badge-success">
|
||||
{{ discount.name }}
|
||||
</span>
|
||||
<span class="badge badge-success">{{ discount.name }}</span>
|
||||
<br/>
|
||||
<p>
|
||||
{{ discount.description }}
|
||||
|
|
@ -255,16 +233,12 @@
|
|||
{% endblock %}
|
||||
{% block order_total %}
|
||||
<tr>
|
||||
<th>
|
||||
|
||||
</th>
|
||||
<th> </th>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="total">
|
||||
<h3>
|
||||
{% trans "Order total" %}
|
||||
</h3>
|
||||
<h3>{% trans "Order total" %}</h3>
|
||||
</th>
|
||||
<td class="total text-right">
|
||||
<h3 class="price_color">
|
||||
|
|
|
|||
|
|
@ -60,75 +60,71 @@
|
|||
{% endif %}
|
||||
{% endblock %}
|
||||
{% block content %}
|
||||
<form method="get">
|
||||
{# Render other search params as hidden inputs #}
|
||||
{% for value in selected_facets %}
|
||||
<input type="hidden" name="selected_facets" value="{{ value }}" />
|
||||
{% endfor %}
|
||||
<input type="hidden" name="q" value="{{ search_form.q.value|default_if_none:"" }}" />
|
||||
{% if paginator.count %}
|
||||
{% if paginator.num_pages > 1 %}
|
||||
{% blocktrans with start=page_obj.start_index end=page_obj.end_index count num_results=paginator.count %}
|
||||
<strong>{{ num_results }}</strong>
|
||||
result - showing
|
||||
<strong>{{ start }}</strong>
|
||||
to
|
||||
<strong>{{ end }}</strong>
|
||||
.
|
||||
{% plural %}
|
||||
<strong>{{ num_results }}</strong>
|
||||
results - showing
|
||||
<strong>{{ start }}</strong>
|
||||
to
|
||||
<strong>{{ end }}</strong>
|
||||
.
|
||||
{% endblocktrans %}
|
||||
<form method="get">
|
||||
{# Render other search params as hidden inputs #}
|
||||
{% for value in selected_facets %}
|
||||
<input type="hidden" name="selected_facets" value="{{ value }}" />
|
||||
{% endfor %}
|
||||
<input type="hidden" name="q" value="{{ search_form.q.value|default_if_none:"" }}" />
|
||||
{% if paginator.count %}
|
||||
{% if paginator.num_pages > 1 %}
|
||||
{% blocktrans with start=page_obj.start_index end=page_obj.end_index count num_results=paginator.count %}
|
||||
<strong>{{ num_results }}</strong>
|
||||
result - showing
|
||||
<strong>{{ start }}</strong>
|
||||
to
|
||||
<strong>{{ end }}</strong>
|
||||
.
|
||||
{% plural %}
|
||||
<strong>{{ num_results }}</strong>
|
||||
results - showing
|
||||
<strong>{{ start }}</strong>
|
||||
to
|
||||
<strong>{{ end }}</strong>
|
||||
.
|
||||
{% endblocktrans %}
|
||||
{% else %}
|
||||
{% blocktrans count num_results=paginator.count %}
|
||||
<strong>{{ num_results }}</strong>
|
||||
result.
|
||||
{% plural %}
|
||||
<strong>{{ num_results }}</strong>
|
||||
results.
|
||||
{% endblocktrans %}
|
||||
{% endif %}
|
||||
{% if form %}
|
||||
<div class="float-right">
|
||||
{% include "oscar/partials/form_field.html" with field=form.sort_by style='horizontal' %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
{% blocktrans count num_results=paginator.count %}
|
||||
<strong>{{ num_results }}</strong>
|
||||
result.
|
||||
{% plural %}
|
||||
<strong>
|
||||
{{ num_results }}
|
||||
</strong>
|
||||
results.
|
||||
{% endblocktrans %}
|
||||
<p>
|
||||
{% trans "
|
||||
<strong>0</strong>
|
||||
results." %}
|
||||
</p>
|
||||
{% endif %}
|
||||
{% if form %}
|
||||
<div class="float-right">
|
||||
{% include "oscar/partials/form_field.html" with field=form.sort_by style='horizontal' %}
|
||||
</form>
|
||||
{% if products %}
|
||||
<section>
|
||||
<div>
|
||||
<ol class="row list-unstyled ml-0 pl-0">
|
||||
{% for product in products %}
|
||||
<li class="col-sm-6 col-md-4 col-lg-3">
|
||||
{% render_product product %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ol>
|
||||
{% include "oscar/partials/pagination.html" %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</section>
|
||||
{% else %}
|
||||
<p>
|
||||
{% trans "
|
||||
<strong>
|
||||
0
|
||||
</strong>
|
||||
results." %}
|
||||
<p class="nonefound">
|
||||
{% trans "No products found." %}
|
||||
</p>
|
||||
{% endif %}
|
||||
</form>
|
||||
{% if products %}
|
||||
<section>
|
||||
<div>
|
||||
<ol class="row list-unstyled ml-0 pl-0">
|
||||
{% for product in products %}
|
||||
<li class="col-sm-6 col-md-4 col-lg-3">
|
||||
{% render_product product %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ol>
|
||||
{% include "oscar/partials/pagination.html" %}
|
||||
</div>
|
||||
</section>
|
||||
{% else %}
|
||||
<p class="nonefound">
|
||||
{% trans "No products found." %}
|
||||
</p>
|
||||
{% endif %}
|
||||
{% endblock content %}
|
||||
{% block onbodyload %}
|
||||
{{ block.super }}
|
||||
oscar.search.init();
|
||||
{{ block.super }}
|
||||
oscar.search.init();
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -26,9 +26,7 @@
|
|||
</li>
|
||||
{% for category in category.get_ancestors %}
|
||||
<li class="breadcrumb-item">
|
||||
<a href="{{ category.get_absolute_url }}">
|
||||
{{ category.name }}
|
||||
</a>
|
||||
<a href="{{ category.get_absolute_url }}">{{ category.name }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
<li class="breadcrumb-item active" aria-current="page">
|
||||
|
|
|
|||
|
|
@ -17,9 +17,7 @@
|
|||
{% with category=product.get_categories.first %}
|
||||
{% for c in category.get_ancestors_and_self %}
|
||||
<li class="breadcrumb-item">
|
||||
<a href="{{ c.get_absolute_url }}">
|
||||
{{ c.name }}
|
||||
</a>
|
||||
<a href="{{ c.get_absolute_url }}">{{ c.name }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
<li class="breadcrumb-item active" aria-current="page">
|
||||
|
|
@ -81,9 +79,7 @@
|
|||
{% for child in product.children.public %}
|
||||
{% purchase_info_for_product request child as child_session %}
|
||||
{% if child_session.availability.is_available_to_buy %}
|
||||
<a href="{{ child.get_absolute_url }}">
|
||||
{{ child.get_title }}
|
||||
</a>
|
||||
<a href="{{ child.get_absolute_url }}">{{ child.get_title }}</a>
|
||||
<br>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
|
@ -127,49 +123,29 @@
|
|||
</tr>
|
||||
{% if session.price.is_tax_known %}
|
||||
<tr>
|
||||
<th>
|
||||
{% trans "Price (incl. tax)" %}
|
||||
</th>
|
||||
<td>
|
||||
{{ session.price.incl_tax|currency:session.price.currency }}
|
||||
</td>
|
||||
<th>{% trans "Price (incl. tax)" %}</th>
|
||||
<td>{{ session.price.incl_tax|currency:session.price.currency }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>
|
||||
{% trans "Tax" %}
|
||||
</th>
|
||||
<td>
|
||||
{{ session.price.tax|currency:session.price.currency }}
|
||||
</td>
|
||||
<th>{% trans "Tax" %}</th>
|
||||
<td>{{ session.price.tax|currency:session.price.currency }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
<tr>
|
||||
<th>
|
||||
{% trans "Availability" %}
|
||||
</th>
|
||||
<td>
|
||||
{{ session.availability.message }}
|
||||
</td>
|
||||
<th>{% trans "Availability" %}</th>
|
||||
<td>{{ session.availability.message }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% for av in product.get_attribute_values %}
|
||||
<tr>
|
||||
<th>
|
||||
{{ av.attribute.name }}
|
||||
</th>
|
||||
<td>
|
||||
{{ av.value_as_html }}
|
||||
</td>
|
||||
<th>{{ av.attribute.name }}</th>
|
||||
<td>{{ av.value_as_html }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% iffeature "reviews" %}
|
||||
<tr>
|
||||
<th>
|
||||
{% trans "Number of reviews" %}
|
||||
</th>
|
||||
<td>
|
||||
{{ product.num_approved_reviews }}
|
||||
</td>
|
||||
<th>{% trans "Number of reviews" %}</th>
|
||||
<td>{{ product.num_approved_reviews }}</td>
|
||||
</tr>
|
||||
{% endiffeature %}
|
||||
</table>
|
||||
|
|
@ -184,9 +160,7 @@
|
|||
{% trans "See all reviews" %}
|
||||
</a>
|
||||
{% endif %}
|
||||
<h2>
|
||||
{% trans "Customer Reviews" %}
|
||||
</h2>
|
||||
<h2>{% trans "Customer Reviews" %}</h2>
|
||||
</div>
|
||||
{% if product.num_approved_reviews == 0 %}
|
||||
<p>
|
||||
|
|
@ -194,9 +168,7 @@
|
|||
{% url 'catalogue:reviews-add' product_slug=product.slug product_pk=product.id as add_review_url %}
|
||||
{% blocktrans %}
|
||||
This product does not have any reviews yet -
|
||||
<a href="{{ add_review_url }}#addreview">
|
||||
be the first to write one
|
||||
</a>
|
||||
<a href="{{ add_review_url }}#addreview">be the first to write one</a>
|
||||
.
|
||||
{% endblocktrans %}
|
||||
{% else %}
|
||||
|
|
@ -218,9 +190,7 @@
|
|||
{% with recommended_products=product.sorted_recommended_products|slice:":6" %}
|
||||
{% if recommended_products %}
|
||||
<div class="sub-header">
|
||||
<h2>
|
||||
{% trans "Recommended items" %}
|
||||
</h2>
|
||||
<h2>{% trans "Recommended items" %}</h2>
|
||||
</div>
|
||||
<ul class="row list-unstyled mx-0">
|
||||
{% for product in recommended_products %}
|
||||
|
|
|
|||
|
|
@ -10,9 +10,7 @@
|
|||
<i class="fas fa-star"></i>
|
||||
<i class="fas fa-star"></i>
|
||||
</span>
|
||||
<a href="{{ review.get_absolute_url }}">
|
||||
{{ review.title }}
|
||||
</a>
|
||||
<a href="{{ review.get_absolute_url }}">{{ review.title }}</a>
|
||||
</h3>
|
||||
</header>
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -12,15 +12,11 @@
|
|||
{% with category=product.categories.all.0 %}
|
||||
{% for c in category.get_ancestors_and_self %}
|
||||
<li class="breadcrumb-item">
|
||||
<a href="{{ c.get_absolute_url }}">
|
||||
{{ c.name }}
|
||||
</a>
|
||||
<a href="{{ c.get_absolute_url }}">{{ c.name }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
<li class="breadcrumb-item">
|
||||
<a href="{{ product.get_absolute_url }}">
|
||||
{{ product.title }}
|
||||
</a>
|
||||
<a href="{{ product.get_absolute_url }}">{{ product.title }}</a>
|
||||
</li>
|
||||
<li class="breadcrumb-item">
|
||||
<a href="{% url 'catalogue:reviews-list' product_slug=product.slug product_pk=product.pk %}">
|
||||
|
|
|
|||
|
|
@ -44,9 +44,7 @@
|
|||
{% trans "Save review" %}
|
||||
</button>
|
||||
{% trans "or" %}
|
||||
<a href="{{ product.get_absolute_url }}">
|
||||
{% trans "cancel" %}
|
||||
</a>
|
||||
<a href="{{ product.get_absolute_url }}">{% trans "cancel" %}</a>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -13,15 +13,11 @@
|
|||
{% with category=product.categories.all.0 %}
|
||||
{% for c in category.get_ancestors_and_self %}
|
||||
<li class="breadcrumb-item">
|
||||
<a href="{{ c.get_absolute_url }}">
|
||||
{{ c.name }}
|
||||
</a>
|
||||
<a href="{{ c.get_absolute_url }}">{{ c.name }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
<li class="breadcrumb-item">
|
||||
<a href="{{ product.get_absolute_url }}">
|
||||
{{ product.title }}
|
||||
</a>
|
||||
<a href="{{ product.get_absolute_url }}">{{ product.title }}</a>
|
||||
</li>
|
||||
{% endwith %}
|
||||
<li class="breadcrumb-item active" aria-current="page">
|
||||
|
|
@ -39,9 +35,7 @@
|
|||
{% if reviews %}
|
||||
<form method="get" class="form-inline">
|
||||
{% include "oscar/partials/form_fields_inline.html" with form=form %}
|
||||
<button type="submit" class="btn btn-secondary">
|
||||
{% trans "Go" %}
|
||||
</button>
|
||||
<button type="submit" class="btn btn-secondary">{% trans "Go" %}</button>
|
||||
</form>
|
||||
<hr>
|
||||
{% for review in reviews %}
|
||||
|
|
|
|||
|
|
@ -12,9 +12,7 @@
|
|||
</div>
|
||||
<div class="col-sm-10">
|
||||
<h2>
|
||||
<a href="{{ product.get_absolute_url }}">
|
||||
{{ product.get_title }}
|
||||
</a>
|
||||
<a href="{{ product.get_absolute_url }}">{{ product.get_title }}</a>
|
||||
</h2>
|
||||
{% include "oscar/catalogue/partials/stock_record.html" %}
|
||||
{% include "oscar/catalogue/reviews/partials/review_stars.html" %}
|
||||
|
|
|
|||
|
|
@ -25,9 +25,7 @@
|
|||
{% for page in flatpages %}
|
||||
<div id="{{ page.title|slugify }}" class="modal hide fade">
|
||||
<div class="modal-header">
|
||||
<a class="close" data-dismiss="modal">
|
||||
×
|
||||
</a>
|
||||
<a class="close" data-dismiss="modal">×</a>
|
||||
<h3>{{ page.title }}</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
|
|
|
|||
|
|
@ -28,36 +28,36 @@
|
|||
{% endif %}
|
||||
">
|
||||
{% if step == 3 or step == 4 %}
|
||||
<a href="{% url 'checkout:shipping-method' %}" class="nav-link">
|
||||
<i class="fas fa-chevron-right"></i>
|
||||
<span>{% trans "2. Shipping method" %}</span>
|
||||
</a>
|
||||
<a href="{% url 'checkout:shipping-method' %}" class="nav-link">
|
||||
<i class="fas fa-chevron-right"></i>
|
||||
<span>{% trans "2. Shipping method" %}</span>
|
||||
</a>
|
||||
{% else %}
|
||||
<span class="navbar-text">{% trans "2. Shipping method" %}</span>
|
||||
<span class="navbar-text">{% trans "2. Shipping method" %}</span>
|
||||
{% endif %}
|
||||
</li>
|
||||
<li >
|
||||
3 %}visited
|
||||
3 %}visited
|
||||
{% else %}
|
||||
disabled
|
||||
disabled
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
">
|
||||
{% if step == 4 %}
|
||||
<a href="{% url 'checkout:payment-details' %}" class="nav-link">
|
||||
<i class="fas fa-chevron-right"></i>
|
||||
<span>{% trans "3. Payment" %}</span>
|
||||
</a>
|
||||
<a href="{% url 'checkout:payment-details' %}" class="nav-link">
|
||||
<i class="fas fa-chevron-right"></i>
|
||||
<span>{% trans "3. Payment" %}</span>
|
||||
</a>
|
||||
{% else %}
|
||||
<span class="navbar-text">{% trans "3. Payment" %}</span>
|
||||
<span class="navbar-text">{% trans "3. Payment" %}</span>
|
||||
{% endif %}
|
||||
</li>
|
||||
<li class="nav-item step4 {% if step == 4 %}active{% else %}disabled{% endif %} ">
|
||||
<span class="navbar-text">{% trans "4. Preview" %}</span>
|
||||
<span class="navbar-text">{% trans "4. Preview" %}</span>
|
||||
</li>
|
||||
<li class="nav-item step5 {% if step == 5 %}active{% else %}disabled{% endif %} ">
|
||||
<span class="navbar-text">{% trans "5. Confirmation" %}</span>
|
||||
<span class="navbar-text">{% trans "5. Confirmation" %}</span>
|
||||
</li>
|
||||
{% endspaceless %}
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -94,9 +94,7 @@
|
|||
{% trans "Continue" %}
|
||||
</button>
|
||||
{% trans "or" %}
|
||||
<a href="{% url 'basket:summary' %}">
|
||||
{% trans "return to basket" %}
|
||||
</a>
|
||||
<a href="{% url 'basket:summary' %}">{% trans "return to basket" %}</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -173,9 +173,7 @@
|
|||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="sub-header">
|
||||
<h2>
|
||||
{% trans 'Totals' %}
|
||||
</h2>
|
||||
<h2>{% trans 'Totals' %}</h2>
|
||||
</div>
|
||||
{% include 'oscar/order/partials/basket_totals.html' %}
|
||||
</div>
|
||||
|
|
@ -185,9 +183,7 @@
|
|||
{% block order_tracking %}
|
||||
{% if not order.user %}
|
||||
<div class="sub-header">
|
||||
<h2>
|
||||
{% trans "Tracking your order" %}
|
||||
</h2>
|
||||
<h2>{% trans "Tracking your order" %}</h2>
|
||||
</div>
|
||||
<p>
|
||||
{% trans "You can track the status of your order" %}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,7 @@
|
|||
{% load i18n %}
|
||||
{% block extra_breadcrumbs %}
|
||||
<li class="breadcrumb-item">
|
||||
<a href="{% url 'customer:email-list' %}">
|
||||
{% trans 'Email history' %}
|
||||
</a>
|
||||
<a href="{% url 'customer:email-list' %}">{% trans 'Email history' %}</a>
|
||||
</li>
|
||||
{% endblock %}
|
||||
{% block tabcontent %}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,7 @@
|
|||
{% load i18n %}
|
||||
{% block extra_breadcrumbs %}
|
||||
<li class="breadcrumb-item">
|
||||
<a href="{% url 'customer:address-list' %}">
|
||||
{% trans 'Address book' %}
|
||||
</a>
|
||||
<a href="{% url 'customer:address-list' %}">{% trans 'Address book' %}</a>
|
||||
</li>
|
||||
{% endblock %}
|
||||
{% block tabcontent %}
|
||||
|
|
@ -21,9 +19,7 @@
|
|||
{% trans 'Delete' %}
|
||||
</button>
|
||||
{% trans 'or' %}
|
||||
<a href="{% url 'customer:address-list' %}">
|
||||
{% trans 'cancel' %}
|
||||
</a>
|
||||
<a href="{% url 'customer:address-list' %}">{% trans 'cancel' %}</a>
|
||||
</div>
|
||||
</form>
|
||||
{% endblock tabcontent %}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,7 @@
|
|||
{% load i18n %}
|
||||
{% block extra_breadcrumbs %}
|
||||
<li class="breadcrumb-item">
|
||||
<a href="{% url 'customer:address-list' %}">
|
||||
{% trans 'Address book' %}
|
||||
</a>
|
||||
<a href="{% url 'customer:address-list' %}">{% trans 'Address book' %}</a>
|
||||
</li>
|
||||
{% endblock %}
|
||||
{% block tabcontent %}
|
||||
|
|
|
|||
|
|
@ -20,9 +20,7 @@
|
|||
<td>
|
||||
{% with product=alert.product %}
|
||||
{% if product.is_public %}
|
||||
<a href="{{ product.get_absolute_url }}">
|
||||
{{ product.get_title }}
|
||||
</a>
|
||||
<a href="{{ product.get_absolute_url }}">{{ product.get_title }}</a>
|
||||
{% else %}
|
||||
{{ product.get_title }}
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -58,18 +58,10 @@
|
|||
<table class="table table-striped table-bordered">
|
||||
<tr>
|
||||
<th>{% trans 'Product' %}</th>
|
||||
<th>
|
||||
{% trans 'Status' %}
|
||||
</th>
|
||||
<th>
|
||||
{% trans 'Quantity' %}
|
||||
</th>
|
||||
<th>
|
||||
{% trans 'Line price excl. tax' %}
|
||||
</th>
|
||||
<th>
|
||||
{% trans 'Line price incl. tax' %}
|
||||
</th>
|
||||
<th>{% trans 'Status' %}</th>
|
||||
<th>{% trans 'Quantity' %}</th>
|
||||
<th>{% trans 'Line price excl. tax' %}</th>
|
||||
<th>{% trans 'Line price incl. tax' %}</th>
|
||||
{% iffeature "reviews" %}
|
||||
<th></th>
|
||||
{% endiffeature %}
|
||||
|
|
@ -85,18 +77,10 @@
|
|||
{{ line.description }}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{{ line.shipping_status|default:"-" }}
|
||||
</td>
|
||||
<td>
|
||||
{{ line.quantity }}
|
||||
</td>
|
||||
<td>
|
||||
{{ line.line_price_before_discounts_excl_tax|currency:order.currency }}
|
||||
</td>
|
||||
<td>
|
||||
{{ line.line_price_before_discounts_incl_tax|currency:order.currency }}
|
||||
</td>
|
||||
<td>{{ line.shipping_status|default:"-" }}</td>
|
||||
<td>{{ line.quantity }}</td>
|
||||
<td>{{ line.line_price_before_discounts_excl_tax|currency:order.currency }}</td>
|
||||
<td>{{ line.line_price_before_discounts_incl_tax|currency:order.currency }}</td>
|
||||
{% iffeature "reviews" %}
|
||||
<td>
|
||||
{% if line.product|is_review_permitted:user %}
|
||||
|
|
@ -112,9 +96,7 @@
|
|||
{% for discount in order.discounts.all %}
|
||||
<tr>
|
||||
<td colspan="5">{{ discount.description }}</td>
|
||||
<td>
|
||||
-{{ discount.amount|currency:order.currency }}
|
||||
</td>
|
||||
<td>-{{ discount.amount|currency:order.currency }}</td>
|
||||
<td colspan="1"></td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
|
@ -124,28 +106,16 @@
|
|||
{% trans 'Totals' %}
|
||||
</caption>
|
||||
<tr>
|
||||
<th>
|
||||
{% trans 'Basket total (inc. tax)' %}
|
||||
</th>
|
||||
<td>
|
||||
{{ order.basket_total_incl_tax|currency:order.currency }}
|
||||
</td>
|
||||
<th>{% trans 'Basket total (inc. tax)' %}</th>
|
||||
<td>{{ order.basket_total_incl_tax|currency:order.currency }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>
|
||||
{% trans 'Shipping charge (inc. tax)' %}
|
||||
</th>
|
||||
<td>
|
||||
{{ order.shipping_incl_tax|currency:order.currency }}
|
||||
</td>
|
||||
<th>{% trans 'Shipping charge (inc. tax)' %}</th>
|
||||
<td>{{ order.shipping_incl_tax|currency:order.currency }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>
|
||||
{% trans 'Order total' %}
|
||||
</th>
|
||||
<td>
|
||||
{{ order.total_incl_tax|currency:order.currency }}
|
||||
</td>
|
||||
<th>{% trans 'Order total' %}</th>
|
||||
<td>{{ order.total_incl_tax|currency:order.currency }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
{% endblock content %}
|
||||
|
|
|
|||
|
|
@ -11,9 +11,7 @@
|
|||
<a href="{{ homepage_url }}">{% trans 'Home' %}</a>
|
||||
</li>
|
||||
<li class="breadcrumb-item">
|
||||
<a href="{% url 'customer:summary' %}">
|
||||
{% trans 'Account' %}
|
||||
</a>
|
||||
<a href="{% url 'customer:summary' %}">{% trans 'Account' %}</a>
|
||||
</li>
|
||||
{% block extra_breadcrumbs %}{% endblock %}
|
||||
<li class="breadcrumb-item active" aria-current="page">
|
||||
|
|
|
|||
|
|
@ -24,9 +24,7 @@
|
|||
{% csrf_token %}
|
||||
{% include "oscar/partials/form_fields.html" with form=login_form %}
|
||||
<p>
|
||||
<a href="{% url 'password-reset' %}">
|
||||
{% trans "I've forgotten my password" %}
|
||||
</a>
|
||||
<a href="{% url 'password-reset' %}">{% trans "I've forgotten my password" %}</a>
|
||||
</p>
|
||||
<button name="login_submit"
|
||||
type="submit"
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue