master #27

Merged
juan merged 4 commits from master into test 2023-02-27 08:46:55 +00:00
5 changed files with 7 additions and 7 deletions

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. * Initial Release.

View File

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

View File

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

View File

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

View File

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