Merge branch 'dev' into 3006-item_filter_category
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
3ea2772e1e
|
|
@ -3,7 +3,6 @@
|
||||||
SCHEMAS=(
|
SCHEMAS=(
|
||||||
account
|
account
|
||||||
bs
|
bs
|
||||||
bi
|
|
||||||
cache
|
cache
|
||||||
edi
|
edi
|
||||||
hedera
|
hedera
|
||||||
|
|
|
||||||
|
|
@ -18,13 +18,8 @@
|
||||||
"acquireTimeout": 20000
|
"acquireTimeout": 20000
|
||||||
},
|
},
|
||||||
"osticket": {
|
"osticket": {
|
||||||
"connector": "vn-mysql",
|
"connector": "memory",
|
||||||
"database": "vn",
|
"timezone": "local"
|
||||||
"debug": false,
|
|
||||||
"host": "localhost",
|
|
||||||
"port": "3306",
|
|
||||||
"username": "root",
|
|
||||||
"password": "root"
|
|
||||||
},
|
},
|
||||||
"tempStorage": {
|
"tempStorage": {
|
||||||
"name": "tempStorage",
|
"name": "tempStorage",
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,8 @@
|
||||||
<vn-horizontal>
|
<vn-horizontal>
|
||||||
<vn-input-number
|
<vn-input-number
|
||||||
ng-model="$ctrl.deliveredAmount"
|
ng-model="$ctrl.deliveredAmount"
|
||||||
label="Delivered amount">
|
label="Delivered amount"
|
||||||
|
step="0.01">
|
||||||
</vn-input-number>
|
</vn-input-number>
|
||||||
<vn-input-number
|
<vn-input-number
|
||||||
disabled="true"
|
disabled="true"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html v-bind:lang="$i18n.locale">
|
<html v-bind:lang="$i18n.locale">
|
||||||
<body>
|
<body>
|
||||||
<table class="grid">
|
<table class="grid">
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -91,6 +91,7 @@
|
||||||
<th width="50%">{{$t('client')}}</th>
|
<th width="50%">{{$t('client')}}</th>
|
||||||
<th class="number">{{$t('address')}}</th>
|
<th class="number">{{$t('address')}}</th>
|
||||||
<th class="number">{{$t('packages')}}</th>
|
<th class="number">{{$t('packages')}}</th>
|
||||||
|
<th>{{$t('packagingType')}}</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
|
@ -99,12 +100,14 @@
|
||||||
<td class="number">{{ticket.id}}</td>
|
<td class="number">{{ticket.id}}</td>
|
||||||
<td width="50%">{{ticket.clientFk}} {{ticket.addressName}}</td>
|
<td width="50%">{{ticket.clientFk}} {{ticket.addressName}}</td>
|
||||||
<td v-if="ticket.addressFk" class="number">
|
<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">
|
<span class="black-container">
|
||||||
{{ticket.addressFk.toString().substr(-3, 3)}}
|
{{ticket.addressFk.toString().substr(-3, 3)}}
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td class="number">{{ticket.packages}}</td>
|
<td class="number">{{ticket.packages}}</td>
|
||||||
|
<td>{{ticket.itemPackingTypes}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
@ -159,5 +162,5 @@
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
@ -30,7 +30,7 @@ module.exports = {
|
||||||
return this.rawSqlFromDef('routes', [routesId]);
|
return this.rawSqlFromDef('routes', [routesId]);
|
||||||
},
|
},
|
||||||
fetchTickets(routesId) {
|
fetchTickets(routesId) {
|
||||||
return this.rawSqlFromDef('tickets', [routesId]);
|
return this.rawSqlFromDef('tickets', [routesId, routesId]);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ order: Orden
|
||||||
client: Cliente
|
client: Cliente
|
||||||
address: Consignatario
|
address: Consignatario
|
||||||
packages: Bultos
|
packages: Bultos
|
||||||
|
packagingType: Encajado
|
||||||
street: Dirección
|
street: Dirección
|
||||||
postcode: Código Postal
|
postcode: Código Postal
|
||||||
city: Ciudad
|
city: Ciudad
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,8 @@ SELECT
|
||||||
am.name ticketAgency,
|
am.name ticketAgency,
|
||||||
tob.description,
|
tob.description,
|
||||||
s.shipFk,
|
s.shipFk,
|
||||||
u.nickName salesPersonName
|
u.nickName salesPersonName,
|
||||||
|
ipkg.itemPackingTypes
|
||||||
FROM route r
|
FROM route r
|
||||||
LEFT JOIN ticket t ON t.routeFk = r.id
|
LEFT JOIN ticket t ON t.routeFk = r.id
|
||||||
LEFT JOIN address a ON a.id = t.addressFk
|
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 warehouse wh ON wh.id = t.warehouseFk
|
||||||
LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
|
LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
|
||||||
LEFT JOIN stowaway s ON s.id = t.id
|
LEFT JOIN stowaway s ON s.id = t.id
|
||||||
WHERE r.id IN(?)
|
LEFT JOIN (
|
||||||
ORDER BY t.priority, t.id
|
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;
|
||||||
|
|
@ -1,9 +1,11 @@
|
||||||
SELECT
|
SELECT
|
||||||
r.id,
|
r.id,
|
||||||
r.amountPaid,
|
r.amountPaid,
|
||||||
r.amountUnpaid,
|
cr.amount AS amountUnpaid,
|
||||||
r.payed,
|
r.payed,
|
||||||
r.companyFk
|
r.companyFk
|
||||||
FROM receipt r
|
FROM receipt r
|
||||||
JOIN client c ON c.id = r.clientFk
|
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 = ?
|
WHERE r.id = ?
|
||||||
Loading…
Reference in New Issue