test into master #42

Merged
juan merged 24 commits from test into master 2023-07-27 20:07:43 +00:00
5 changed files with 7 additions and 7 deletions
Showing only changes of commit 9945c8f1b6 - Show all commits

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (23.6.5) stable; urgency=low
hedera-web (23.6.8) stable; urgency=low
* Initial Release.

View File

@ -8,7 +8,7 @@
tip="_ConfigureOrder"
on-click="this.onConfigureClick()"/>
<htk-bar-button
icon="local_florist"
icon="shopping_bag"
tip="_Catalog"
on-click="this.onCatalogClick()"/>
<htk-bar-button

View File

@ -14,7 +14,7 @@
class="htk-list box confirmed vn-w-sm"
form-id="iter">
<db-model property="model" id="orders">
SELECT o.id, o.sent, o.deliveryMethodFk, o.total,
SELECT o.id, o.sent, o.deliveryMethodFk, o.taxableBase,
a.nickname, am.description agency
FROM myOrder o
JOIN myAddress a ON a.id = o.addressFk
@ -33,7 +33,7 @@
<p>#{{iter.id}}</p>
<p>{{iter.nickname}}</p>
<p>{{iter.agency}}</p>
<p>{{Vn.Value.format(iter.total, '%.2d€')}}</p>
<p>{{Vn.Value.format(iter.taxableBase, '%.2d€')}}</p>
</div>
<div
class="actions"

View File

@ -1,6 +1,6 @@
{
"name": "hedera-web",
"version": "23.6.5",
"version": "23.6.8",
"description": "Verdnatura web page",
"license": "GPL-3.0",
"repository": {

View File

@ -10,7 +10,7 @@ class Supplant extends Vn\Web\JsonRequest {
'SELECT id FROM account.user WHERE `name` = #',
[$_REQUEST['supplantUser']]
);
/*
$isClient = $db->getValue(
'SELECT COUNT(*) > 0 FROM vn.client WHERE id = #',
[$userId]
@ -24,7 +24,7 @@ class Supplant extends Vn\Web\JsonRequest {
);
if ($hasAccount)
throw new Web\ForbiddenException(s('The user is not impersonable'));
*/
return $this->service->createToken($_REQUEST['supplantUser']);
}
}