Initial Switch to V2. Completely Overhauled Backend, Frontend and General Structure.
This commit is contained in:
@@ -370,12 +370,11 @@
|
||||
{% set L_DISC = "Έκπτ." %}
|
||||
{% set L_QTY = "Ποσ." %}
|
||||
{% set L_UNIT = "Μον." %}
|
||||
{% set L_VAT_COL = "Φ.Π.Α." %}
|
||||
{% set L_TOTAL = "Σύνολο" %}
|
||||
{% set L_SUBTOTAL = "Υποσύνολο" %}
|
||||
{% set L_GLOBAL_DISC = quotation.global_discount_label or "Έκπτωση" %}
|
||||
{% set L_NEW_SUBTOTAL = "Νέο Υποσύνολο" %}
|
||||
{% set L_VAT = "ΣΥΝΟΛΟ Φ.Π.Α." %}
|
||||
{% set L_VAT = "ΣΥΝΟΛΟ Φ.Π.Α. " ~ (quotation.global_vat_percent | int) ~ "%" %}
|
||||
{% set L_SHIPPING_COST = "Μεταφορικά / Shipping" %}
|
||||
{% set L_INSTALL_COST = "Εγκατάσταση / Installation" %}
|
||||
{% set L_EXTRAS = quotation.extras_label or "Άλλα" %}
|
||||
@@ -403,12 +402,11 @@
|
||||
{% set L_DISC = "Disc." %}
|
||||
{% set L_QTY = "Qty" %}
|
||||
{% set L_UNIT = "Unit" %}
|
||||
{% set L_VAT_COL = "VAT" %}
|
||||
{% set L_TOTAL = "Total" %}
|
||||
{% set L_SUBTOTAL = "Subtotal" %}
|
||||
{% set L_GLOBAL_DISC = quotation.global_discount_label or "Discount" %}
|
||||
{% set L_NEW_SUBTOTAL = "New Subtotal" %}
|
||||
{% set L_VAT = "Total VAT" %}
|
||||
{% set L_VAT = "Total VAT " ~ (quotation.global_vat_percent | int) ~ "%" %}
|
||||
{% set L_SHIPPING_COST = "Shipping / Transport" %}
|
||||
{% set L_INSTALL_COST = "Installation" %}
|
||||
{% set L_EXTRAS = quotation.extras_label or "Extras" %}
|
||||
@@ -469,7 +467,7 @@
|
||||
|
||||
<div class="order-block">
|
||||
<div class="block-title">{{ L_ORDER_META }}</div>
|
||||
<table class="fields"><tbody>{% if quotation.order_type %}<tr><td class="lbl">{{ L_ORDER_TYPE }}</td><td class="val">{{ quotation.order_type }}</td></tr>{% endif %}{% if quotation.shipping_method %}<tr><td class="lbl">{{ L_SHIP_METHOD }}</td><td class="val">{{ quotation.shipping_method }}</td></tr>{% endif %}{% if quotation.estimated_shipping_date %}<tr><td class="lbl">{{ L_SHIP_DATE }}</td><td class="val">{{ quotation.estimated_shipping_date }}</td></tr>{% else %}<tr><td class="lbl">{{ L_SHIP_DATE }}</td><td class="val text-muted">—</td></tr>{% endif %}</tbody></table>
|
||||
<table class="fields"><tbody>{% if quotation.order_type %}<tr><td class="lbl">{{ L_ORDER_TYPE }}</td><td class="val">{{ quotation.order_type }}</td></tr>{% endif %}{% if quotation.shipping_method %}<tr><td class="lbl">{{ L_SHIP_METHOD }}</td><td class="val">{{ quotation.shipping_method }}</td></tr>{% endif %}{% if quotation.estimated_shipping_date %}{% set _dp = quotation.estimated_shipping_date.split('-') %}{% set _dfmt = _dp[2] + '/' + _dp[1] + '/' + _dp[0] if _dp | length == 3 else quotation.estimated_shipping_date %}<tr><td class="lbl">{{ L_SHIP_DATE }}</td><td class="val">{{ _dfmt }}</td></tr>{% else %}<tr><td class="lbl">{{ L_SHIP_DATE }}</td><td class="val text-muted">—</td></tr>{% endif %}</tbody></table>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -478,13 +476,12 @@
|
||||
<table class="items-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width:38%">{{ L_DESC }}</th>
|
||||
<th class="right" style="width:11%">{{ L_UNIT_COST }}</th>
|
||||
<th class="center" style="width:7%">{{ L_DISC }}</th>
|
||||
<th class="center" style="width:7%">{{ L_QTY }}</th>
|
||||
<th class="center" style="width:7%">{{ L_UNIT }}</th>
|
||||
<th class="center" style="width:6%">{{ L_VAT_COL }}</th>
|
||||
<th class="right" style="width:12%">{{ L_TOTAL }}</th>
|
||||
<th style="width:44%">{{ L_DESC }}</th>
|
||||
<th class="right" style="width:13%">{{ L_UNIT_COST }}</th>
|
||||
<th class="center" style="width:8%">{{ L_DISC }}</th>
|
||||
<th class="center" style="width:8%">{{ L_QTY }}</th>
|
||||
<th class="center" style="width:8%">{{ L_UNIT }}</th>
|
||||
<th class="right" style="width:14%">{{ L_TOTAL }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -501,26 +498,19 @@
|
||||
</td>
|
||||
<td class="center">{{ item.quantity | int if item.quantity == (item.quantity | int) else item.quantity }}</td>
|
||||
<td class="center muted">{{ item.unit_type }}</td>
|
||||
<td class="center">
|
||||
{% if item.vat_percent and item.vat_percent > 0 %}
|
||||
{{ item.vat_percent | int }}%
|
||||
{% else %}
|
||||
<span class="dash">—</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="right">{{ item.line_total | format_money }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% if quotation.items | length == 0 %}
|
||||
<tr>
|
||||
<td colspan="7" class="text-muted" style="text-align:center; padding: 12px;">—</td>
|
||||
<td colspan="6" class="text-muted" style="text-align:center; padding: 12px;">—</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
{# ── Shipping / Install as special rows ── #}
|
||||
{% set has_special = (quotation.shipping_cost and quotation.shipping_cost > 0) or (quotation.install_cost and quotation.install_cost > 0) %}
|
||||
{% if has_special %}
|
||||
<tr class="special-spacer"><td colspan="7"></td></tr>
|
||||
<tr class="special-spacer"><td colspan="6"></td></tr>
|
||||
{% endif %}
|
||||
|
||||
{% if quotation.shipping_cost and quotation.shipping_cost > 0 %}
|
||||
@@ -531,7 +521,6 @@
|
||||
<td class="center"><span class="dash">—</span></td>
|
||||
<td class="center">1</td>
|
||||
<td class="center muted">—</td>
|
||||
<td class="center"><span class="dash">—</span></td>
|
||||
<td class="right">{{ ship_net | format_money }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
@@ -544,7 +533,6 @@
|
||||
<td class="center"><span class="dash">—</span></td>
|
||||
<td class="center">1</td>
|
||||
<td class="center muted">—</td>
|
||||
<td class="center"><span class="dash">—</span></td>
|
||||
<td class="right">{{ install_net | format_money }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
Reference in New Issue
Block a user