wbuezas
/
hedera-web-mindshore
forked from verdnatura/hedera-web
0
1
Fork 0
Code Pull Requests Activity

Backup

This commit is contained in:
Juan Ferrer Toribio 2017-03-17 13:42:10 +01:00
parent 043c11a4ed
commit 86a19925d8
52 changed files with 575 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.eslintrc.yml
View File

@ -1,3 +1,4 @@
extends: eslint:recommended extends: eslint:recommended
rules: rules:
no-undef: 0 no-undef: 0
no-redeclare: 0

6
forms/account/address-list/ui.xml
View File

@ -19,9 +19,9 @@
</custom> </custom>
</db-model> </db-model>
</vn-group> </vn-group>
<div id="title"> <h1 id="title">
<h1><t>Addresses</t></h1> <t>Addresses</t>
</div> </h1>
<div id="actions"> <div id="actions">
<htk-bar-button <htk-bar-button
icon="add" icon="add"

6
forms/account/address/ui.xml
View File

@ -24,9 +24,9 @@
</db-model> </db-model>
</db-form> </db-form>
</vn-group> </vn-group>
<div id="title"> <h1 id="title">
<h1><t>AddEditAddress</t></h1> <t>AddEditAddress</t>
</div> </h1>
<div id="actions"> <div id="actions">
<htk-bar-button <htk-bar-button
icon="ok" icon="ok"

6
forms/account/conf/ui.xml
View File

@ -30,9 +30,9 @@
</custom> </custom>
</db-model> </db-model>
</vn-group> </vn-group>
<div id="title"> <h1 id="title">
<h1><t>Configuration</t></h1> <t>Configuration</t>
</div> </h1>
<div id="actions"> <div id="actions">
<htk-bar-button <htk-bar-button
icon="place" icon="place"

6
forms/admin/access-log/ui.xml
View File

@ -16,9 +16,9 @@
</db-model> </db-model>
</db-form> </db-form>
</vn-group> </vn-group>
<div id="title"> <h1 id="title">
<h1><t>AccessLog</t></h1> <t>AccessLog</t>
</div> </h1>
<div id="form" class="access-log"> <div id="form" class="access-log">
<div class="card form"> <div class="card form">
<p> <p>

6
forms/admin/connections/ui.xml
View File

@ -1,7 +1,7 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>Connections</t></h1> <t>Connections</t>
</div> </h1>
<div id="actions"> <div id="actions">
<htk-bar-button <htk-bar-button
icon="refresh" icon="refresh"

6
forms/admin/items/ui.xml
View File

@ -1,7 +1,7 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>Item list</t></h1> <t>Item list</t>
</div> </h1>
<div id="actions" class="action-bar"> <div id="actions" class="action-bar">
<htk-bar-button <htk-bar-button
icon="print" icon="print"

6
forms/admin/links/ui.xml
View File

@ -1,7 +1,7 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>ControlPanel</t></h1> <t>ControlPanel</t>
</div> </h1>
<div id="form" class="cpanel"> <div id="form" class="cpanel">
<div class="card list"> <div class="card list">
<htk-repeater form-id="iter" renderer="repeaterFunc"> <htk-repeater form-id="iter" renderer="repeaterFunc">

6
forms/admin/photos/ui.xml
View File

@ -1,7 +1,7 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>Photos</t></h1> <t>Photos</t>
</div> </h1>
<div id="form" class="photos"> <div id="form" class="photos">
<form <form
id="html-form" id="html-form"

6
forms/admin/queries/ui.xml
View File

@ -1,7 +1,7 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>Queries</t></h1> <t>Queries</t>
</div> </h1>
<div id="actions"> <div id="actions">
<htk-bar-button <htk-bar-button
icon="ok" icon="ok"

6
forms/admin/shelves/ui.xml
View File

@ -10,9 +10,9 @@
</db-model> </db-model>
<vn-basic-set id="set"/> <vn-basic-set id="set"/>
</vn-group> </vn-group>
<div id="title"> <h1 id="title">
<h1><t>Shelves</t></h1> <t>Shelves</t>
</div> </h1>
<div id="actions"> <div id="actions">
<htk-bar-button <htk-bar-button
icon="print" icon="print"

6
forms/admin/users/ui.xml
View File

@ -3,9 +3,9 @@
<vn-param id="user-name"/> <vn-param id="user-name"/>
<vn-hash-param key="user" param="user-name"/> <vn-hash-param key="user" param="user-name"/>
</vn-group> </vn-group>
<div id="title"> <h1 id="title">
<h1><t>UserManagement</t></h1> <t>UserManagement</t>
</div> </h1>
<div id="actions"> <div id="actions">
<htk-search-entry <htk-search-entry
param="user-name"/> param="user-name"/>

6
forms/admin/visits/ui.xml
View File

@ -1,7 +1,7 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>Visits</t></h1> <t>Visits</t>
</div> </h1>
<div id="actions"> <div id="actions">
<htk-bar-button <htk-bar-button
icon="refresh" icon="refresh"

6
forms/agencies/packages/ui.xml
View File

@ -1,7 +1,7 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>ListByAgency</t></h1> <t>ListByAgency</t>
</div> </h1>
<div id="form" class="packages"> <div id="form" class="packages">
<div class="card"> <div class="card">
<htk-grid> <htk-grid>

6
forms/agencies/provinces/ui.xml
View File

@ -3,9 +3,9 @@
<vn-param id="agency"/> <vn-param id="agency"/>
<vn-hash-param key="agency" param="agency"/> <vn-hash-param key="agency" param="agency"/>
</vn-group> </vn-group>
<div id="title"> <h1 id="title">
<h1><t>ByProvince</t></h1> <t>ByProvince</t>
</div> </h1>
<div id="form" class="provinces"> <div id="form" class="provinces">
<div class="card"> <div class="card">
<htk-grid> <htk-grid>

6
forms/cms/about/ui.xml
View File

@ -1,7 +1,7 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>About</t></h1> <t>About</t>
</div> </h1>
<div id="form" class="about"> <div id="form" class="about">
<div class="cols"> <div class="cols">
<div class="card"> <div class="card">

6
forms/cms/contact/ui.xml
View File

@ -1,7 +1,7 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>IWantCustomer</t></h1> <t>IWantCustomer</t>
</div> </h1>
<div id="form" class="contact"> <div id="form" class="contact">
<form <form
id="contact-form"> id="contact-form">

6
forms/cms/home/ui.xml
View File

@ -1,7 +1,7 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>Home</t></h1> <t>Home</t>
</div> </h1>
<div id="actions" class="catalog-actions"> <div id="actions" class="catalog-actions">
<htk-bar-button <htk-bar-button
class="start-order" class="start-order"

6
forms/cms/location/ui.xml
View File

@ -1,6 +1,6 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>Location</t></h1> <t>Location</t>
</div> </h1>
<div id="form" class="location"/> <div id="form" class="location"/>
</vn> </vn>

6
forms/cms/training/ui.xml
View File

@ -1,7 +1,7 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>Training</t></h1> <t>Training</t>
</div> </h1>
<div id="form" class="training"> <div id="form" class="training">
<div class="column mansonry" id="news-column"> <div class="column mansonry" id="news-column">
<htk-repeater form-id="new"> <htk-repeater form-id="new">

6
forms/cms/why/ui.xml
View File

@ -1,7 +1,7 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>AboutCompany</t></h1> <t>AboutCompany</t>
</div> </h1>
<div id="form" class="why"> <div id="form" class="why">
<div class="card"> <div class="card">
<div class="body"> <div class="body">

1
forms/ecomerce/basket/style.css
View File

@ -62,4 +62,3 @@
{ {
border-radius: 50%; border-radius: 50%;
} }

8
forms/ecomerce/basket/ui.xml
View File

@ -1,7 +1,7 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>ShoppingBasket</t></h1> <t>ShoppingBasket</t>
</div> </h1>
<div id="actions"> <div id="actions">
<htk-bar-button <htk-bar-button
icon="ok" icon="ok"
@ -30,7 +30,7 @@
<db-model id="items" property="model" updatable="true"> <db-model id="items" property="model" updatable="true">
<custom> <custom>
SELECT i.id, i.amount, i.price, a.Article, a.Categoria, SELECT i.id, i.amount, i.price, a.Article, a.Categoria,
a.Medida, a.Tallos, a.Color, o.Abreviatura, a.Foto a.Medida, a.Tallos, a.Color, o.Abreviatura, a.Foto
FROM basket_item i FROM basket_item i
JOIN vn2008.Articles a ON a.Id_Article = i.item_id JOIN vn2008.Articles a ON a.Id_Article = i.item_id
LEFT JOIN vn2008.Origen o ON a.id_origen = o.id LEFT JOIN vn2008.Origen o ON a.id_origen = o.id

2
forms/ecomerce/catalog/catalog.js
View File

@ -206,7 +206,7 @@ Hedera.Catalog = new Class
title = types.get (row, 'name'); title = types.get (row, 'name');
} }
Vn.Node.setText (this.$('title-text'), title); Vn.Node.setText (this.$('title'), title);
} }
,onRightPanelClick: function (event) ,onRightPanelClick: function (event)

6
forms/ecomerce/catalog/ui.xml
View File

@ -121,9 +121,9 @@
</custom> </custom>
</db-model> </db-model>
</vn-group> </vn-group>
<div id="title"> <h1 id="title">
<h1 id="title-text"><t>Catalog</t></h1> <t>Catalog</t>
</div> </h1>
<div id="actions" class="catalog-actions"> <div id="actions" class="catalog-actions">
<button class="menu" on-click="onShowMenuClick"> <button class="menu" on-click="onShowMenuClick">
<img src="image/icon/dark/menu.svg" alt="_Menu"/> <img src="image/icon/dark/menu.svg" alt="_Menu"/>

2
forms/ecomerce/checkout/checkout.js
View File

@ -56,7 +56,7 @@ Hedera.Checkout = new Class
{ {
this.disableButtons (true); this.disableButtons (true);
var query = 'CALL basket_configure (#date, #method, #agency, #address)'; var query = 'CALL basketConfigure (#date, #method, #agency, #address)';
var batch = new Sql.Batch (); var batch = new Sql.Batch ();
batch.addParam ('method', this.$('method')); batch.addParam ('method', this.$('method'));

34
forms/ecomerce/checkout/ui.xml
View File

@ -15,23 +15,15 @@
<db-form id="order-form" on-ready="onValuesReady"> <db-form id="order-form" on-ready="onValuesReady">
<db-model property="model"> <db-model property="model">
<custom> <custom>
SELECT v.code delivery_method, o.date_send, o.agency_id, o.address_id SELECT d.code delivery_method, o.date_send, o.agency_id, o.address_id
FROM basket o FROM basket o
JOIN vn2008.Vistas v ON o.delivery_method_id = v.vista_id JOIN vn.deliveryMethod d ON d.id = o.delivery_method_id
</custom> </custom>
</db-model> </db-model>
</db-form> </db-form>
<db-model id="agencies" auto-load="false" result-index="1" on-status-changed="onAgenciesReady"> <db-model id="agencies" auto-load="false" on-status-changed="onAgenciesReady">
<custom> <custom>
CALL agency_list_from_date (#date, #address); CALL vn.agencyListForMethod(#date, #address, 'AGENCY')
SELECT a.Id_Agencia, a.description
FROM t_agency t
JOIN vn2008.Agencias a ON a.Id_Agencia = t.agency_id
JOIN vn2008.Vistas v ON a.Vista = v.vista_id
WHERE a.web != FALSE
AND v.code = 'AGENCY'
ORDER BY a.description;
DROP TEMPORARY TABLE t_agency;
</custom> </custom>
<sql-batch property="batch"> <sql-batch property="batch">
<custom> <custom>
@ -40,17 +32,9 @@
</custom> </custom>
</sql-batch> </sql-batch>
</db-model> </db-model>
<db-model id="warehouses" auto-load="false" result-index="1" on-status-changed="onWarehousesReady"> <db-model id="warehouses" auto-load="false" on-status-changed="onWarehousesReady">
<custom> <custom>
CALL agency_list_from_date (#date, #address); CALL vn.agencyListForMethod(#date, #address, 'PICKUP')
SELECT a.Id_Agencia, a.description
FROM t_agency t
JOIN vn2008.Agencias a ON a.Id_Agencia = t.agency_id
JOIN vn2008.Vistas v ON a.Vista = v.vista_id
WHERE a.web != FALSE
AND v.code = 'PICKUP'
ORDER BY a.description;
DROP TEMPORARY TABLE t_agency;
</custom> </custom>
<sql-batch property="batch"> <sql-batch property="batch">
<custom> <custom>
@ -60,9 +44,9 @@
</sql-batch> </sql-batch>
</db-model> </db-model>
</vn-group> </vn-group>
<div id="title"> <h1 id="title">
<h1><t>ConfigureOrder</t></h1> <t>ConfigureOrder</t>
</div> </h1>
<div id="actions"> <div id="actions">
<htk-bar-button <htk-bar-button
icon="close" icon="close"

6
forms/ecomerce/confirm/ui.xml
View File

@ -29,9 +29,9 @@
</custom> </custom>
</db-query> </db-query>
</vn-group> </vn-group>
<div id="title"> <h1 id="title">
<h1><t>Order summary</t></h1> <t>Order summary</t>
</div> </h1>
<div id="form" class="confirm"> <div id="form" class="confirm">
<div class="summary form card"> <div class="summary form card">
<div> <div>

6
forms/ecomerce/invoices/ui.xml
View File

@ -1,7 +1,7 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>Invoices</t></h1> <t>Invoices</t>
</div> </h1>
<div id="form" class="invoices"> <div id="form" class="invoices">
<div class="card"> <div class="card">
<div> <div>

4
forms/ecomerce/orders/orders.js
View File

@ -40,7 +40,7 @@ Hedera.Orders = new Class
,onPayButtonClick: function () ,onPayButtonClick: function ()
{ {
var amount = -this.$('debt').value; var amount = -this.$('debt').get('debt');
amount = amount <= 0 ? null : amount; amount = amount <= 0 ? null : amount;
@ -49,7 +49,7 @@ Hedera.Orders = new Class
if (amount !== null) if (amount !== null)
defaultAmountStr = Vn.Value.format (amount, '%.2d'); defaultAmountStr = Vn.Value.format (amount, '%.2d');
var amount = parseFloat (prompt (_('AmountToPay:'), defaultAmountStr)); amount = parseFloat (prompt (_('AmountToPay:'), defaultAmountStr));
this.tpv.pay (amount, null); this.tpv.pay (amount, null);
} }

37
forms/ecomerce/orders/ui.xml
View File

@ -1,16 +1,16 @@
<vn> <vn>
<vn-group> <vn-group>
<db-model id="debt-model" result-index="1"> <db-form id="debt">
<custom> <db-model property="model">
CALL customer_get_debt_by_company (); <custom>
SELECT -amount amount FROM t_customer_debt; SELECT clientGetDebt() debt
DROP TEMPORARY TABLE t_customer_debt; </custom>
</custom> </db-model>
</db-model> </db-form>
</vn-group> </vn-group>
<div id="title"> <h1 id="title">
<h1><t>LastOrders</t></h1> <t>LastOrders</t>
</div> </h1>
<div id="actions"> <div id="actions">
<htk-bar-button <htk-bar-button
icon="basket" icon="basket"
@ -28,16 +28,8 @@
<t>Balance:</t> <t>Balance:</t>
</span> </span>
<span class="amount" id="balance"> <span class="amount" id="balance">
<htk-text <htk-text form="debt" column="debt" format="%.2d€"/>
format="%.2d€" </span>
conditional-func="balanceConditionalFunc">
<db-calc-sum
property="param"
model="debt-model"
column-name="amount"
id="debt"/>
</htk-text>
</span>
<img <img
src="image/icon/dark/info.svg" src="image/icon/dark/info.svg"
title="_PaymentInfo" title="_PaymentInfo"
@ -50,7 +42,7 @@
<htk-repeater form-id="iter" renderer="repeaterFunc"> <htk-repeater form-id="iter" renderer="repeaterFunc">
<db-model property="model" id="tickets"> <db-model property="model" id="tickets">
<custom> <custom>
CALL ticket_list (); CALL clientTicketList ()
</custom> </custom>
</db-model> </db-model>
<custom> <custom>
@ -67,6 +59,9 @@
<p> <p>
<htk-text form="iter" column="type"/> <htk-text form="iter" column="type"/>
</p> </p>
<p>
<htk-text form="iter" column="ticket_id"/>
</p>
</a> </a>
</custom> </custom>
</htk-repeater> </htk-repeater>

2
forms/ecomerce/ticket/locale/ca.json
View File

@ -1,7 +1,7 @@
{ {
"OrderDetail": "Detall de l'encarrec" "OrderDetail": "Detall de l'encarrec"
,"Print delivery note": "Imprimir albarà" ,"Delivery note": "Albarà"
,"Delivery": "Entrega" ,"Delivery": "Entrega"
,"Total": "Total" ,"Total": "Total"

2
forms/ecomerce/ticket/locale/en.json
View File

@ -1,7 +1,7 @@
{ {
"OrderDetail": "Order detail" "OrderDetail": "Order detail"
,"Print delivery note": "Print delivery note" ,"Delivery note": "Delivery note"
,"Delivery": "Delivery" ,"Delivery": "Delivery"
,"Total": "Total" ,"Total": "Total"

3
forms/ecomerce/ticket/locale/es.json
View File

@ -1,12 +1,13 @@
{ {
"OrderDetail": "Detalle del pedido" "OrderDetail": "Detalle del pedido"
,"Print delivery note": "Imprimir albarán" ,"Delivery note": "Albarán"
,"Delivery": "Entrega" ,"Delivery": "Entrega"
,"Total": "Total" ,"Total": "Total"
,"Tax base": "Base imponible" ,"Tax base": "Base imponible"
,"VAT": "IVA" ,"VAT": "IVA"
,"Total + VAT": "Total + IVA"
,"ItemNumber": "Nº artículo" ,"ItemNumber": "Nº artículo"
,"Amount": "Cant" ,"Amount": "Cant"

4
forms/ecomerce/ticket/locale/fr.json
View File

@ -1,9 +1,9 @@
{ {
"OrderDetail": "Détails de la commande" "OrderDetail": "Détails de la commande"
,"Print delivery note": "Imprimer bulletin de livraison" ,"Delivery note": "Bulletin de livraison"
,"Delivery": "Accouchement" ,"Delivery": "Livraison"
,"Total": "Total" ,"Total": "Total"
,"Tax base": "Imposable" ,"Tax base": "Imposable"
,"VAT": "TVA" ,"VAT": "TVA"

2
forms/ecomerce/ticket/locale/mn.json
View File

@ -1,7 +1,7 @@
{ {
"OrderDetail": "Order detail" "OrderDetail": "Order detail"
,"Print delivery note": "Print delivery note" ,"Delivery note": "Delivery note"
,"Delivery": "Delivery" ,"Delivery": "Delivery"
,"Total": "Total" ,"Total": "Total"

2
forms/ecomerce/ticket/locale/pt.json
View File

@ -1,7 +1,7 @@
{ {
"OrderDetail": "Detalhe do pedido" "OrderDetail": "Detalhe do pedido"
,"Print delivery note": "Imprimir guía de remessa" ,"Delivery note": "Guía de remessa"
,"Delivery": "Entrega" ,"Delivery": "Entrega"
,"Total": "Total" ,"Total": "Total"

4
forms/ecomerce/ticket/ticket.js
View File

@ -10,10 +10,10 @@ Hedera.Ticket = new Class
var batch = new Sql.Batch (); var batch = new Sql.Batch ();
batch.addValue ('ticket', ticket.value); batch.addValue ('ticket', ticket.value);
this.conn.execQuery ('CALL ticketLog (#ticket)', null, batch); this.conn.execQuery ('CALL clientTicketLog (#ticket)', null, batch);
} }
,onPrintClick: function (event) ,onPrintClick: function ()
{ {
var batch = new Sql.Batch (); var batch = new Sql.Batch ();
batch.addValue ('ticket', this.$('ticket-id').value); batch.addValue ('ticket', this.$('ticket-id').value);

38
forms/ecomerce/ticket/ui.xml
View File

@ -3,15 +3,9 @@
<vn-param id="ticket-id" on-changed="onTicketChange"/> <vn-param id="ticket-id" on-changed="onTicketChange"/>
<vn-hash-param key="ticket" param="ticket-id"/> <vn-hash-param key="ticket" param="ticket-id"/>
<db-form id="ticket"> <db-form id="ticket">
<db-model id="ticket-data" property="model"> <db-model property="model">
<custom> <custom>
SELECT t.id, date, a.Agencia, note, p.name province, CALL clientTicketGet(#ticket)
zip_code, city, c.name, consignee, invoice, delivery
FROM ticket_view t
JOIN address_view c ON t.address_id = c.id
JOIN vn2008.Agencias a ON t.agency_id = a.Id_Agencia
JOIN vn2008.province p ON c.province_id = p.province_id
WHERE t.id = #ticket
</custom> </custom>
<sql-batch property="batch"> <sql-batch property="batch">
<custom> <custom>
@ -21,13 +15,13 @@
</db-model> </db-model>
</db-form> </db-form>
</vn-group> </vn-group>
<div id="title"> <h1 id="title">
<h1><t>OrderDetail</t></h1> <t>OrderDetail</t>
</div> </h1>
<div id="actions" class="action-bar"> <div id="actions" class="action-bar">
<htk-bar-button <htk-bar-button
icon="print" icon="receipt"
tip="_Print delivery note" tip="_Delivery note"
on-click="onPrintClick"/> on-click="onPrintClick"/>
</div> </div>
<div id="form" class="ticket"> <div id="form" class="ticket">
@ -60,24 +54,18 @@
<div> <div>
<p class="important total"> <p class="important total">
<t>Total</t> <t>Total</t>
<htk-text format="%.2d€"> <htk-text form="ticket" column="total" format="%.2d€"/>
<db-calc-sum property="param" func="subtotal" model="movements"/> </p>
</htk-text> <p class="important total">
<t>Total + VAT</t>
<htk-text form="ticket" column="totalPlusVat" format="%.2d€"/>
</p> </p>
</div> </div>
</div> </div>
<htk-repeater form-id="iter" renderer="repeaterFunc"> <htk-repeater form-id="iter" renderer="repeaterFunc">
<db-model property="model" id="movements"> <db-model property="model" id="movements">
<custom> <custom>
SELECT m.item_id, m.amount, m.concept, CALL clientTicketRowGet(#ticket)
IF(m.fixed != FALSE, m.price, NULL) price, m.fixed, m.discount,
o.Abreviatura, a.Categoria, a.Medida, a.Tallos, a.Color, a.Foto
FROM ticket_row_view m
INNER JOIN vn2008.Articles a
ON m.item_id = a.Id_Article AND ticket_id = #ticket
LEFT JOIN vn2008.Origen o
ON a.id_origen = o.id
ORDER BY concept
</custom> </custom>
<sql-batch property="batch"> <sql-batch property="batch">
<custom> <custom>

6
forms/news/new/ui.xml
View File

@ -21,9 +21,9 @@
</db-form> </db-form>
<db-param form="iter" column="text" on-changed="onBodyChange"/> <db-param form="iter" column="text" on-changed="onBodyChange"/>
</vn-group> </vn-group>
<div id="title"> <h1 id="title">
<h1><t>AddEditNew</t></h1> <t>AddEditNew</t>
</div> </h1>
<div id="actions"> <div id="actions">
<htk-bar-button <htk-bar-button
icon="ok" icon="ok"

6
forms/news/news/ui.xml
View File

@ -1,7 +1,7 @@
<vn> <vn>
<div id="title"> <h1 id="title">
<h1><t>NewsManagement</t></h1> <t>NewsManagement</t>
</div> </h1>
<div id="actions"> <div id="actions">
<htk-bar-button <htk-bar-button
icon="add" icon="add"

62
image/icon/dark/receipt.svg Normal file
View File

@ -0,0 +1,62 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="16"
viewBox="0 0 16 16"
width="16"
version="1.1"
id="svg6"
sodipodi:docname="receipt.svg"
style="fill:#000000"
inkscape:version="0.92.1 r15371">
<metadata
id="metadata12">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs10" />
<sodipodi:namedview
pagecolor="#666666"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1016"
id="namedview8"
showgrid="false"
inkscape:zoom="22.627417"
inkscape:cx="-8.4089381"
inkscape:cy="13.293182"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg6" />
<path
d="M 12.2,11.5 H 3.8 v -1.4 h 8.4 z m 0,-2.8 H 3.8 V 7.3 h 8.4 z m 0,-2.8 H 3.8 V 4.5 h 8.4 z M 1.7,15 2.75,13.95 3.8,15 4.85,13.95 5.9,15 6.95,13.95 8,15 9.05,13.95 10.1,15 11.15,13.95 12.2,15 13.25,13.95 14.3,15 V 1 L 13.25,2.05 12.2,1 11.15,2.05 10.1,1 9.05,2.05 8,1 6.95,2.05 5.9,1 4.85,2.05 3.8,1 2.75,2.05 1.7,1 Z"
id="path2"
style="fill:#ffffff;fill-opacity:1;stroke-width:0.70000029"
inkscape:connector-curvature="0" />
<path
d="M 0,-8 H 24 V 16 H 0 Z"
id="path4"
inkscape:connector-curvature="0"
style="fill:none" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

32
image/icon/light/print.svg
View File

@ -12,7 +12,7 @@
id="svg7384" id="svg7384"
sodipodi:docname="print.svg" sodipodi:docname="print.svg"
version="1.1" version="1.1"
inkscape:version="0.48.5 r10040" inkscape:version="0.92.1 r15371"
height="16" height="16"
width="16"> width="16">
<metadata <metadata
@ -28,13 +28,13 @@
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
<sodipodi:namedview <sodipodi:namedview
inkscape:cy="72.4546" inkscape:cy="8"
pagecolor="#555753" pagecolor="#555753"
borderopacity="1" borderopacity="1"
showborder="false" showborder="false"
inkscape:bbox-paths="false" inkscape:bbox-paths="false"
guidetolerance="10" guidetolerance="10"
inkscape:window-width="1310" inkscape:window-width="1920"
showguides="true" showguides="true"
inkscape:snap-bbox="true" inkscape:snap-bbox="true"
inkscape:pageshadow="2" inkscape:pageshadow="2"
@ -44,24 +44,26 @@
objecttolerance="10" objecttolerance="10"
id="namedview88" id="namedview88"
showgrid="false" showgrid="false"
inkscape:window-maximized="0" inkscape:window-maximized="1"
inkscape:window-x="54" inkscape:window-x="1920"
inkscape:window-y="27" inkscape:window-y="27"
gridtolerance="10" gridtolerance="10"
inkscape:window-height="701" inkscape:window-height="1016"
inkscape:current-layer="layer10" inkscape:current-layer="layer10"
inkscape:zoom="2.0390625" inkscape:zoom="51.4375"
inkscape:cx="-25.548654" inkscape:cx="8"
inkscape:pageopacity="1"> inkscape:pageopacity="1">
<inkscape:grid <inkscape:grid
spacingx="1px" spacingx="1"
spacingy="1px" spacingy="1"
id="grid4866" id="grid4866"
empspacing="2" empspacing="2"
enabled="true" enabled="true"
type="xygrid" type="xygrid"
snapvisiblegridlinesonly="true" snapvisiblegridlinesonly="true"
visible="true" /> visible="true"
originx="0"
originy="0" />
</sodipodi:namedview> </sodipodi:namedview>
<title <title
id="title9167">Gnome Symbolic Icon Theme</title> id="title9167">Gnome Symbolic Icon Theme</title>
@ -87,25 +89,25 @@
inkscape:label="Layer 1" inkscape:label="Layer 1"
transform="translate(142,338)" transform="translate(142,338)"
id="layer1-6" id="layer1-6"
style="fill:#333333;fill-opacity:1"> style="fill:#666666;fill-opacity:1">
<path <path
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
d="M 2,4 C 1.5,4 1,4.5 1,5 l 0,4 c 0,0.5 0.5,1 1,1 l 1,0 0,-2 10,0 0,2 1,0 c 0.5,0 1,-0.5 1,-1 L 15,5 C 15,4.5 14.5,4 14,4 L 2,4 z" d="M 2,4 C 1.5,4 1,4.5 1,5 l 0,4 c 0,0.5 0.5,1 1,1 l 1,0 0,-2 10,0 0,2 1,0 c 0.5,0 1,-0.5 1,-1 L 15,5 C 15,4.5 14.5,4 14,4 L 2,4 z"
id="path3520" id="path3520"
sodipodi:nodetypes="ccccccccccccc" sodipodi:nodetypes="ccccccccccccc"
style="fill:#333333;fill-opacity:1;stroke:none" /> style="fill:#666666;fill-opacity:1;stroke:none" />
<path <path
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
d="M 4,1 4,3 12,3 12,1 4,1 z" d="M 4,1 4,3 12,3 12,1 4,1 z"
id="path4804" id="path4804"
sodipodi:nodetypes="ccccc" sodipodi:nodetypes="ccccc"
style="fill:#333333;fill-opacity:1;stroke:none" /> style="fill:#666666;fill-opacity:1;stroke:none" />
<path <path
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
d="M 4,9.0000001 4,14 l 8,0 0,-5 -8,10e-8 z M 5,10 l 6,0 0,1 -6,0 0,-1 z m 0,2 5,0 0,1 -5,0 0,-1 z" d="M 4,9.0000001 4,14 l 8,0 0,-5 -8,10e-8 z M 5,10 l 6,0 0,1 -6,0 0,-1 z m 0,2 5,0 0,1 -5,0 0,-1 z"
id="path4806" id="path4806"
sodipodi:nodetypes="ccccccccccccccc" sodipodi:nodetypes="ccccccccccccccc"
style="fill:#333333;fill-opacity:1;stroke:none" /> style="fill:#666666;fill-opacity:1;stroke:none" />
</g> </g>
</g> </g>
<g <g

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

136
image/icon/light/print_backup.svg Normal file
View File

@ -0,0 +1,136 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg7384"
sodipodi:docname="print.svg"
version="1.1"
inkscape:version="0.48.5 r10040"
height="16"
width="16">
<metadata
id="metadata90">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>Gnome Symbolic Icon Theme</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
inkscape:cy="72.4546"
pagecolor="#555753"
borderopacity="1"
showborder="false"
inkscape:bbox-paths="false"
guidetolerance="10"
inkscape:window-width="1310"
showguides="true"
inkscape:snap-bbox="true"
inkscape:pageshadow="2"
inkscape:guide-bbox="true"
inkscape:snap-nodes="true"
bordercolor="#666666"
objecttolerance="10"
id="namedview88"
showgrid="false"
inkscape:window-maximized="0"
inkscape:window-x="54"
inkscape:window-y="27"
gridtolerance="10"
inkscape:window-height="701"
inkscape:current-layer="layer10"
inkscape:zoom="2.0390625"
inkscape:cx="-25.548654"
inkscape:pageopacity="1">
<inkscape:grid
spacingx="1px"
spacingy="1px"
id="grid4866"
empspacing="2"
enabled="true"
type="xygrid"
snapvisiblegridlinesonly="true"
visible="true" />
</sodipodi:namedview>
<title
id="title9167">Gnome Symbolic Icon Theme</title>
<defs
id="defs7386" />
<g
inkscape:label="status"
transform="translate(-142,-338)"
inkscape:groupmode="layer"
id="layer9"
style="display:inline" />
<g
inkscape:label="devices"
transform="translate(-142,-338)"
inkscape:groupmode="layer"
id="layer10">
<g
inkscape:label="accessories-calculator"
transform="translate(94,-60)"
id="g10819"
style="fill:#333333;fill-opacity:1" />
<g
inkscape:label="Layer 1"
transform="translate(142,338)"
id="layer1-6"
style="fill:#333333;fill-opacity:1">
<path
inkscape:connector-curvature="0"
d="M 2,4 C 1.5,4 1,4.5 1,5 l 0,4 c 0,0.5 0.5,1 1,1 l 1,0 0,-2 10,0 0,2 1,0 c 0.5,0 1,-0.5 1,-1 L 15,5 C 15,4.5 14.5,4 14,4 L 2,4 z"
id="path3520"
sodipodi:nodetypes="ccccccccccccc"
style="fill:#333333;fill-opacity:1;stroke:none" />
<path
inkscape:connector-curvature="0"
d="M 4,1 4,3 12,3 12,1 4,1 z"
id="path4804"
sodipodi:nodetypes="ccccc"
style="fill:#333333;fill-opacity:1;stroke:none" />
<path
inkscape:connector-curvature="0"
d="M 4,9.0000001 4,14 l 8,0 0,-5 -8,10e-8 z M 5,10 l 6,0 0,1 -6,0 0,-1 z m 0,2 5,0 0,1 -5,0 0,-1 z"
id="path4806"
sodipodi:nodetypes="ccccccccccccccc"
style="fill:#333333;fill-opacity:1;stroke:none" />
</g>
</g>
<g
inkscape:label="apps"
transform="translate(-142,-338)"
inkscape:groupmode="layer"
id="layer11" />
<g
inkscape:label="actions"
transform="translate(-142,-338)"
inkscape:groupmode="layer"
id="layer12" />
<g
inkscape:label="places"
transform="translate(-142,-338)"
inkscape:groupmode="layer"
id="layer13" />
<g
inkscape:label="mimetypes"
transform="translate(-142,-338)"
inkscape:groupmode="layer"
id="layer14" />
<g
inkscape:label="emblems"
transform="translate(-142,-338)"
inkscape:groupmode="layer"
id="layer15" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

62
image/icon/light/receipt.svg Normal file
View File

@ -0,0 +1,62 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="16"
viewBox="0 0 16 16"
width="16"
version="1.1"
id="svg6"
sodipodi:docname="receipt.svg"
style="fill:#000000"
inkscape:version="0.92.1 r15371">
<metadata
id="metadata12">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs10" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1016"
id="namedview8"
showgrid="false"
inkscape:zoom="22.627417"
inkscape:cx="4.849314"
inkscape:cy="13.469959"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg6" />
<path
d="M 12.2,11.5 H 3.8 v -1.4 h 8.4 z m 0,-2.8 H 3.8 V 7.3 h 8.4 z m 0,-2.8 H 3.8 V 4.5 h 8.4 z M 1.7,15 2.75,13.95 3.8,15 4.85,13.95 5.9,15 6.95,13.95 8,15 9.05,13.95 10.1,15 11.15,13.95 12.2,15 13.25,13.95 14.3,15 V 1 L 13.25,2.05 12.2,1 11.15,2.05 10.1,1 9.05,2.05 8,1 6.95,2.05 5.9,1 4.85,2.05 3.8,1 2.75,2.05 1.7,1 Z"
id="path2"
style="fill:#666666;fill-opacity:1;stroke-width:0.70000029"
inkscape:connector-curvature="0" />
<path
d="M 0,-8 H 24 V 16 H 0 Z"
id="path4"
inkscape:connector-curvature="0"
style="fill:none" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

133
image/icon/light/refresh_backup.svg Normal file
View File

@ -0,0 +1,133 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg7384"
sodipodi:docname="refresh.svg"
inkscape:version="0.48.5 r10040"
version="1.1"
width="16"
height="16">
<metadata
id="metadata90">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>Gnome Symbolic Icon Theme</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
inkscape:zoom="2.0390625"
inkscape:bbox-paths="false"
inkscape:pageopacity="1"
guidetolerance="10"
inkscape:snap-bbox="true"
inkscape:window-height="701"
objecttolerance="10"
id="namedview88"
showborder="false"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:cx="-82.864112"
inkscape:cy="10.6119"
gridtolerance="10"
inkscape:snap-bbox-midpoints="false"
showguides="true"
inkscape:pageshadow="2"
pagecolor="#555753"
bordercolor="#666666"
inkscape:snap-global="true"
inkscape:window-maximized="0"
inkscape:object-nodes="false"
inkscape:snap-nodes="false"
inkscape:guide-bbox="true"
inkscape:window-width="1364"
inkscape:snap-others="false"
borderopacity="1"
showgrid="false"
inkscape:snap-to-guides="true"
inkscape:object-paths="false"
inkscape:snap-grids="true"
inkscape:current-layer="layer12">
<inkscape:grid
enabled="true"
spacingx="1px"
spacingy="1px"
id="grid4866"
visible="true"
snapvisiblegridlinesonly="true"
empspacing="2"
type="xygrid" />
</sodipodi:namedview>
<title
id="title9167">Gnome Symbolic Icon Theme</title>
<defs
id="defs7386" />
<g
id="layer9"
transform="translate(-241.0002,-627)"
inkscape:label="status"
style="display:inline"
inkscape:groupmode="layer" />
<g
id="layer10"
transform="translate(-241.0002,-627)"
inkscape:label="devices"
inkscape:groupmode="layer" />
<g
id="layer11"
transform="translate(-241.0002,-627)"
inkscape:label="apps"
inkscape:groupmode="layer" />
<g
id="layer13"
transform="translate(-241.0002,-627)"
inkscape:label="places"
inkscape:groupmode="layer" />
<g
id="layer14"
transform="translate(-241.0002,-627)"
inkscape:label="mimetypes"
inkscape:groupmode="layer" />
<g
id="layer15"
transform="translate(-241.0002,-627)"
inkscape:label="emblems"
style="display:inline"
inkscape:groupmode="layer" />
<g
id="g71291"
transform="translate(-241.0002,-627)"
inkscape:label="emotes"
style="display:inline"
inkscape:groupmode="layer" />
<g
id="g4953"
transform="translate(-241.0002,-627)"
inkscape:label="categories"
style="display:inline"
inkscape:groupmode="layer" />
<g
id="layer12"
transform="translate(-241.0002,-627)"
inkscape:label="actions"
style="display:inline"
inkscape:groupmode="layer">
<path
id="path4597"
d="m 253.90645,628.96875 a 1.0001,1.0001 0 0 0 -0.125,0.0312 1.0001,1.0001 0 0 0 -0.78125,1 l 0,1.6875 c -0.38225,-0.57796 -0.84927,-1.08223 -1.40625,-1.5 -1.15563,-0.86677 -2.53199,-1.25227 -3.875,-1.1875 -0.19186,0.009 -0.37223,0.0353 -0.5625,0.0625 -1.52218,0.21741 -2.97815,1.02304 -3.96875,2.34375 -1.98119,2.64144 -1.42267,6.42505 1.21875,8.40625 2.64147,1.98122 6.42504,1.42267 8.40625,-1.21875 A 1.0063276,1.0063276 0 0 0 253.0002,638 a 1.0063276,1.0063276 0 0 0 0,-0.15625 l 0,-0.84375 -0.8125,0 -0.0937,0 a 1.0063276,1.0063276 0 0 0 -0.0937,0 1.0063276,1.0063276 0 0 0 -0.8125,0.40625 c -1.33265,1.77674 -3.81702,2.11387 -5.59375,0.78125 -1.77674,-1.33264 -2.1139,-3.81699 -0.78125,-5.59375 1.33265,-1.77674 3.817,-2.11389 5.59375,-0.78125 0.42946,0.32212 0.76954,0.73295 1.03125,1.1875 l -1.4375,0 a 1.0001,1.0001 0 0 0 -1,1 1.0001,1.0001 0 0 0 0,0.21875 l 0,0.78125 0.84375,0 0.15625,0 4,0 1,0 0,-1 0,-4 a 1.0001,1.0001 0 0 0 0,-0.1875 l 0,-0.8125 -0.8125,0 a 1.0001,1.0001 0 0 0 -0.28125,-0.0312 z"
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#666666;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
inkscape:connector-curvature="0" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

3
js/hedera/basket-checker.js
View File

@ -3,7 +3,7 @@ module.exports =
{ {
check: function (conn, callback) check: function (conn, callback)
{ {
conn.execQuery ('CALL basket_check ()', conn.execQuery ('CALL basketCheck ()',
this._onBasketCheck.bind (this, callback)); this._onBasketCheck.bind (this, callback));
} }
@ -24,4 +24,3 @@ module.exports =
Vn.Hash.set ({'form': 'ecomerce/checkout'}); Vn.Hash.set ({'form': 'ecomerce/checkout'});
} }
}; };

2
js/hedera/form.js
View File

@ -73,7 +73,7 @@ module.exports = new Class
this.deactivate (); this.deactivate ();
this.gui.setTitle (null); this.gui.setTitle (null);
this.gui.setActions (null); this.gui.setActions (null);
Vn.Node.remove (this.node); this.gui.setForm (null);
this.deactivate (); this.deactivate ();
this.node = null; this.node = null;
} }

13
js/hedera/gui.css
View File

@ -56,7 +56,7 @@
{ {
float: left; float: left;
} }
.vn-gui .title h1 .vn-gui .title > h1
{ {
font-weight: normal; font-weight: normal;
font-size: 1.4em; font-size: 1.4em;
@ -279,6 +279,11 @@
transition-duration: 200ms; transition-duration: 200ms;
} }
.vn-gui .form-holder .vn-gui .form-holder
{
position: relative;
height: inherit;
}
.vn-gui .form-holder > *
{ {
position: relative; position: relative;
height: inherit; height: inherit;
@ -288,10 +293,10 @@
-webkit-transform: translateZ(0) translateX(-2em); -webkit-transform: translateZ(0) translateX(-2em);
transition-property: opacity, transform; transition-property: opacity, transform;
transition-duration: 200ms;
transition-timing-function: ease-out; transition-timing-function: ease-out;
transition-duration: 200ms;
} }
.vn-gui .form-holder.show .vn-gui .form-holder > .slide
{ {
opacity: 1; opacity: 1;
transform: translateZ(0) translateX(0em); transform: translateZ(0) translateX(0em);
@ -348,7 +353,7 @@
max-height: 0; max-height: 0;
transition: max-height 300ms ease-out; transition: max-height 300ms ease-out;
webkit-transition: max-height 300ms ease-out; -webkit-transition: max-height 300ms ease-out;
} }
.vn-gui .main-menu li:hover > ul.submenu .vn-gui .main-menu li:hover > ul.submenu
{ {

10
js/hedera/gui.js
View File

@ -432,14 +432,17 @@ module.exports = new Class
if (form) if (form)
{ {
this.$('form-holder').appendChild (form); var div = this.createElement('div');
setTimeout (this._onSetFormTimeout.bind (this), 0); div.appendChild (form);
this.$('form-holder').appendChild (div);
setTimeout (this._onSetFormTimeout.bind (this));
} }
} }
,_onSetFormTimeout: function () ,_onSetFormTimeout: function ()
{ {
Vn.Node.addClass (this.$('form-holder'), 'show'); Vn.Node.addClass (this.$('form-holder').firstChild, 'slide');
} }
,setTitle: function (title) ,setTitle: function (title)
@ -456,7 +459,6 @@ module.exports = new Class
{ {
if (this.activeForm) if (this.activeForm)
{ {
Vn.Node.removeClass (this.$('form-holder'), 'show');
this.activeForm.close (); this.activeForm.close ();
this.activeForm.unref (); this.activeForm.unref ();
this.activeForm = null; this.activeForm = null;

3
reports/delivery-note/locale/es.json
View File

@ -1,3 +1,4 @@
{ {
"Import": "Importe" "Import": "Importe"
,"Total + VAT": "Total + IVA"
} }

34
reports/delivery-note/ui.xml
View File

@ -3,13 +3,7 @@
<db-form id="ticket"> <db-form id="ticket">
<db-model property="model" id="ticket-data" conn="conn" batch="batch"> <db-model property="model" id="ticket-data" conn="conn" batch="batch">
<custom> <custom>
SELECT t.id, date, a.Agencia, note, p.name province, CALL clientTicketGet(#ticket)
zip_code, city, c.name, consignee, invoice
FROM ticket_view t
JOIN address_view c ON t.address_id = c.id
JOIN vn2008.Agencias a ON t.agency_id = a.Id_Agencia
JOIN vn2008.province p ON c.province_id = p.province_id
WHERE t.id = #ticket
</custom> </custom>
</db-model> </db-model>
</db-form> </db-form>
@ -40,17 +34,10 @@
<htk-grid> <htk-grid>
<db-model property="model" id="movements" conn="conn" batch="batch"> <db-model property="model" id="movements" conn="conn" batch="batch">
<custom> <custom>
SELECT m.item_id, amount, concept, Categoria, Medida, Tallos, Color, CALL clientTicketRowGet(#ticket)
Abreviatura, IF(fixed != FALSE, price, NULL) price, fixed, discount
FROM ticket_row_view m
INNER JOIN vn2008.Articles a
ON m.item_id = a.Id_Article AND ticket_id = #ticket
LEFT JOIN vn2008.Origen o
ON a.id_origen = o.id
ORDER BY concept
</custom> </custom>
</db-model> </db-model>
<htk-column-spin title="_Ref" column="item_id"/> <htk-column-spin title="_Ref" column="item"/>
<htk-column-spin title="_Amount" column="amount"/> <htk-column-spin title="_Amount" column="amount"/>
<htk-column-text title="_Item" column="concept"/> <htk-column-text title="_Item" column="concept"/>
<htk-column-text title="_S1" column="Medida"/> <htk-column-text title="_S1" column="Medida"/>
@ -58,10 +45,15 @@
<htk-column-spin title="_Price" column="price" unit="€" digits="2"/> <htk-column-spin title="_Price" column="price" unit="€" digits="2"/>
<htk-column-spin title="_Import" unit="€" digits="2" renderer="subtotalRenderer"/> <htk-column-spin title="_Import" unit="€" digits="2" renderer="subtotalRenderer"/>
</htk-grid> </htk-grid>
<p class="footer"> <div class="footer">
<htk-text format="%.2d€"> <p>
<db-calc-sum property="param" func="subtotal" model="movements"/> <t>Total</t>
</htk-text> <htk-text form="ticket" column="total" format="%.2d€"/>
</p> </p>
<p>
<t>Total + VAT</t>
<htk-text form="ticket" column="totalPlusVat" format="%.2d€"/>
</p>
</div>
</div> </div>
</vn> </vn>