verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch 'dev' into 3006-item_filter_category
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2021-07-01 09:54:57 +00:00
parent d946750113 8ef5c56a98
commit 3ea2772e1e
8 changed files with 187 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/export-structure.sh
View File

@ -3,7 +3,6 @@
SCHEMAS=(
account
bs
bi
cache
edi
hedera

9
loopback/server/datasources.json
View File

@ -18,13 +18,8 @@
"acquireTimeout": 20000
},
"osticket": {
"connector": "vn-mysql",
"database": "vn",
"debug": false,
"host": "localhost",
"port": "3306",
"username": "root",
"password": "root"
"connector": "memory",
"timezone": "local"
},
"tempStorage": {
"name": "tempStorage",

3
modules/client/front/balance/create/index.html
View File

@ -60,7 +60,8 @@
<vn-horizontal>
<vn-input-number
ng-model="$ctrl.deliveredAmount"
label="Delivered amount">
label="Delivered amount"
step="0.01">
</vn-input-number>
<vn-input-number
disabled="true"

9
print/templates/reports/driver-route/driver-route.html
View File

@ -1,6 +1,6 @@
<!DOCTYPE html>
<html v-bind:lang="$i18n.locale">
<body>
<body>
<table class="grid">
<tbody>
<tr>
@ -91,6 +91,7 @@
<th width="50%">{{$t('client')}}</th>
<th class="number">{{$t('address')}}</th>
<th class="number">{{$t('packages')}}</th>
<th>{{$t('packagingType')}}</th>
</tr>
</thead>
<tbody>
@ -99,12 +100,14 @@
<td class="number">{{ticket.id}}</td>
<td width="50%">{{ticket.clientFk}} {{ticket.addressName}}</td>
<td v-if="ticket.addressFk" class="number">
{{ticket.addressFk.toString().substr(0, ticket.addressFk.toString().length - 3)}}
{{ticket.addressFk.toString().substr(0,
ticket.addressFk.toString().length - 3)}}
<span class="black-container">
{{ticket.addressFk.toString().substr(-3, 3)}}
</span>
</td>
<td class="number">{{ticket.packages}}</td>
<td>{{ticket.itemPackingTypes}}</td>
</tr>
</tbody>
</table>
@ -159,5 +162,5 @@
</tr>
</tbody>
</table>
</body>
</body>
</html>

2
print/templates/reports/driver-route/driver-route.js
View File

@ -30,7 +30,7 @@ module.exports = {
return this.rawSqlFromDef('routes', [routesId]);
},
fetchTickets(routesId) {
return this.rawSqlFromDef('tickets', [routesId]);
return this.rawSqlFromDef('tickets', [routesId, routesId]);
}
},
components: {

1
print/templates/reports/driver-route/locale/es.yml
View File

@ -10,6 +10,7 @@ order: Orden
client: Cliente
address: Consignatario
packages: Bultos
packagingType: Encajado
street: Dirección
postcode: Código Postal
city: Ciudad

17
print/templates/reports/driver-route/sql/tickets.sql
View File

@ -18,7 +18,8 @@ SELECT
am.name ticketAgency,
tob.description,
s.shipFk,
u.nickName salesPersonName
u.nickName salesPersonName,
ipkg.itemPackingTypes
FROM route r
LEFT JOIN ticket t ON t.routeFk = r.id
LEFT JOIN address a ON a.id = t.addressFk
@ -30,5 +31,15 @@ FROM route r
LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
LEFT JOIN stowaway s ON s.id = t.id
WHERE r.id IN(?)
ORDER BY t.priority, t.id
LEFT JOIN (
SELECT t.id AS ticketFk,
GROUP_CONCAT(DISTINCT(i.itemPackingTypeFk)) AS itemPackingTypes
FROM route r
JOIN ticket t ON t.routeFk = r.id
JOIN sale s ON s.ticketFk = t.id
JOIN item i ON i.id = s.itemFk
WHERE r.id IN (?)
GROUP BY t.id
) ipkg ON ipkg.ticketFk = t.id
WHERE r.id IN (?)
ORDER BY t.priority, t.id;

4
print/templates/reports/receipt/sql/receipt.sql
View File

@ -1,9 +1,11 @@
SELECT
r.id,
r.amountPaid,
r.amountUnpaid,
cr.amount AS amountUnpaid,
r.payed,
r.companyFk
FROM receipt r
JOIN client c ON c.id = r.clientFk
JOIN vn.clientRisk cr ON cr.clientFk = c.id
AND cr.companyFk = r.companyFk
WHERE r.id = ?