Debt bugs solved, code unified.
This commit is contained in:
parent
7ce6571770
commit
5897197b89
|
@ -1,4 +1,4 @@
|
||||||
hedera-web (1.405.48) stable; urgency=low
|
hedera-web (1.405.49) stable; urgency=low
|
||||||
|
|
||||||
* Initial Release.
|
* Initial Release.
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
SELECT o.id, o.date_send, o.note, o.company_id,
|
SELECT o.id, o.date_send, o.note, o.company_id,
|
||||||
ag.description agency, v.code method,
|
ag.description agency, v.code method,
|
||||||
ad.consignee, ad.zip_code, ad.city, ad.name address,
|
ad.consignee, ad.zip_code, ad.city, ad.name address,
|
||||||
t.*, c.credit, customer_get_debt() debt
|
t.*, c.credit, clientGetDebt(NULL) debt
|
||||||
FROM basket o
|
FROM basket o
|
||||||
JOIN vn2008.Agencias ag ON ag.Id_Agencia = o.agency_id
|
JOIN vn2008.Agencias ag ON ag.Id_Agencia = o.agency_id
|
||||||
LEFT JOIN address_view ad ON ad.id = o.address_id
|
LEFT JOIN address_view ad ON ad.id = o.address_id
|
||||||
|
|
|
@ -17,14 +17,14 @@ Hedera.Orders = new Class
|
||||||
|
|
||||||
,onBasketClick: function ()
|
,onBasketClick: function ()
|
||||||
{
|
{
|
||||||
this.hash.set ({'form': 'ecomerce/basket'});
|
this.hash.set ({form: 'ecomerce/basket'});
|
||||||
}
|
}
|
||||||
|
|
||||||
,repeaterFunc: function (res, form)
|
,repeaterFunc: function (res, form)
|
||||||
{
|
{
|
||||||
res.$('link').href = this.hash.make ({
|
res.$('link').href = this.hash.make ({
|
||||||
'form': 'ecomerce/ticket',
|
form: 'ecomerce/ticket',
|
||||||
'ticket': form.get ('ticket_id')
|
ticket: form.get ('ticket_id')
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,4 @@
|
||||||
<vn>
|
<vn>
|
||||||
<vn-group>
|
|
||||||
<db-model id="debt-model" result-index="1">
|
|
||||||
<custom>
|
|
||||||
CALL customer_get_debt_by_company ();
|
|
||||||
SELECT -amount amount FROM t_customer_debt;
|
|
||||||
DROP TEMPORARY TABLE t_customer_debt;
|
|
||||||
</custom>
|
|
||||||
</db-model>
|
|
||||||
</vn-group>
|
|
||||||
<div id="title">
|
<div id="title">
|
||||||
<h1><t>LastOrders</t></h1>
|
<h1><t>LastOrders</t></h1>
|
||||||
</div>
|
</div>
|
||||||
|
@ -28,14 +19,17 @@
|
||||||
<t>Balance:</t>
|
<t>Balance:</t>
|
||||||
</span>
|
</span>
|
||||||
<span class="amount" id="balance">
|
<span class="amount" id="balance">
|
||||||
<htk-text
|
<htk-text id="debt"
|
||||||
format="%.2d€"
|
format="%.2d€"
|
||||||
conditional-func="balanceConditionalFunc">
|
conditional-func="balanceConditionalFunc"
|
||||||
<db-calc-sum
|
column="debt">
|
||||||
property="param"
|
<db-form property="form">
|
||||||
model="debt-model"
|
<db-model property="model">
|
||||||
column-name="amount"
|
<custom>
|
||||||
id="debt"/>
|
SELECT clientGetDebt(NULL) debt
|
||||||
|
</custom>
|
||||||
|
</db-model>
|
||||||
|
</db-form>
|
||||||
</htk-text>
|
</htk-text>
|
||||||
</span>
|
</span>
|
||||||
<img
|
<img
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "hedera-web",
|
"name": "hedera-web",
|
||||||
"version": "1.405.48",
|
"version": "1.405.49",
|
||||||
"description": "Verdnatura web page",
|
"description": "Verdnatura web page",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
Loading…
Reference in New Issue