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.
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
SELECT o.id, o.date_send, o.note, o.company_id,
|
||||
ag.description agency, v.code method,
|
||||
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
|
||||
JOIN vn2008.Agencias ag ON ag.Id_Agencia = o.agency_id
|
||||
LEFT JOIN address_view ad ON ad.id = o.address_id
|
||||
|
|
|
@ -17,14 +17,14 @@ Hedera.Orders = new Class
|
|||
|
||||
,onBasketClick: function ()
|
||||
{
|
||||
this.hash.set ({'form': 'ecomerce/basket'});
|
||||
this.hash.set ({form: 'ecomerce/basket'});
|
||||
}
|
||||
|
||||
,repeaterFunc: function (res, form)
|
||||
{
|
||||
res.$('link').href = this.hash.make ({
|
||||
'form': 'ecomerce/ticket',
|
||||
'ticket': form.get ('ticket_id')
|
||||
form: 'ecomerce/ticket',
|
||||
ticket: form.get ('ticket_id')
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -1,13 +1,4 @@
|
|||
<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">
|
||||
<h1><t>LastOrders</t></h1>
|
||||
</div>
|
||||
|
@ -28,16 +19,19 @@
|
|||
<t>Balance:</t>
|
||||
</span>
|
||||
<span class="amount" id="balance">
|
||||
<htk-text
|
||||
<htk-text id="debt"
|
||||
format="%.2d€"
|
||||
conditional-func="balanceConditionalFunc">
|
||||
<db-calc-sum
|
||||
property="param"
|
||||
model="debt-model"
|
||||
column-name="amount"
|
||||
id="debt"/>
|
||||
conditional-func="balanceConditionalFunc"
|
||||
column="debt">
|
||||
<db-form property="form">
|
||||
<db-model property="model">
|
||||
<custom>
|
||||
SELECT clientGetDebt(NULL) debt
|
||||
</custom>
|
||||
</db-model>
|
||||
</db-form>
|
||||
</htk-text>
|
||||
</span>
|
||||
</span>
|
||||
<img
|
||||
src="image/icon/dark/info.svg"
|
||||
title="_PaymentInfo"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "hedera-web",
|
||||
"version": "1.405.48",
|
||||
"version": "1.405.49",
|
||||
"description": "Verdnatura web page",
|
||||
"license": "GPL-3.0",
|
||||
"repository": {
|
||||
|
|
Loading…
Reference in New Issue