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

7226-testToMaster_2416 #2320

Merged
alexm merged 188 commits from 7226-testToMaster_2416 into master 2024-04-18 05:39:36 +00:00
Conversation 0 Commits 188 Files Changed 106 +71 -63
4 changed files with 71 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit de5e954ce2 - Show all commits

10
print/templates/reports/driver-route/assets/css/style.css
View File

@ -1,3 +1,13 @@
td{
overflow: hidden;
max-width: 100px;
text-overflow: ellipsis;
}
/* .text-field{
text-overflow: ellipsis;
} */
h1 { h1 {
text-align: center; text-align: center;
} }

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

@ -103,7 +103,7 @@
<table width="100%"> <table width="100%">
<tbody> <tbody>
<tr> <tr>
<th class="font gray align-right">{{$t('street')}}</th> <th class="text-field font gray align-right">{{$t('street')}}</th>
<td>{{ticket.street}}</td> <td>{{ticket.street}}</td>
<th class="font gray align-right">{{$t('postcode')}}</th> <th class="font gray align-right">{{$t('postcode')}}</th>
<td>{{ticket.postalCode}}</td> <td>{{ticket.postalCode}}</td>

37
print/templates/reports/driver-route/sql/routes.sql
View File

@ -1,19 +1,18 @@
SELECT SELECT r.id,
r.id, r.m3,
r.m3, r.created,
r.created, r.time,
r.time, u.nickName userNickName,
u.nickName userNickName, v.tradeMark vehicleTradeMark,
v.tradeMark vehicleTradeMark, v.model vehicleModel,
v.model vehicleModel, v.numberPlate plateNumber,
v.numberPlate plateNumber, IFNULL(s.name, am.name) agencyName
IFNULL(s.name, am.name) AS agencyName FROM route r
FROM route r LEFT JOIN vehicle v ON v.id = r.vehicleFk
LEFT JOIN vehicle v ON v.id = r.vehicleFk LEFT JOIN worker w ON w.id = r.workerFk
LEFT JOIN worker w ON w.id = r.workerFk LEFT JOIN account.user u ON u.id = w.id
LEFT JOIN account.user u ON u.id = w.id LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
LEFT JOIN agencyMode am ON am.id = r.agencyModeFk LEFT JOIN agency a ON a.id = am.agencyFk
LEFT JOIN agency a ON a.id = am.agencyFk LEFT JOIN supplierAgencyTerm sa ON sa.agencyFk = a.id
LEFT JOIN supplierAgencyTerm sa ON sa.agencyFk = a.id LEFT JOIN supplier s ON s.id = sa.supplierFk
LEFT JOIN supplier s ON s.id = sa.supplierFk WHERE r.id IN(?)
WHERE r.id IN(?)

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

@ -1,43 +1,42 @@
SELECT SELECT t.nickname addressName,
t.nickname addressName, t.packages,
t.packages, t.priority,
t.priority, t.id,
t.id, t.clientFk,
t.clientFk, t.companyFk,
t.companyFk, t.routeFk,
t.routeFk, if(a.phone, a.phone, c.phone) phone,
if(a.phone, a.phone, c.phone) AS phone, if(a.mobile, a.mobile, c.mobile) mobile,
if(a.mobile, a.mobile, c.mobile) AS mobile, wh.name warehouseName,
wh.name warehouseName, a.city,
a.city, a.street,
a.street, a.postalCode,
a.postalCode, LPAD(a.id, 5, '0') addressFk,
LPAD(a.id, 5, '0') AS addressFk, p.name province,
p.name province, 0 import,
0 AS import, am.name ticketAgency,
am.name ticketAgency, tob.description,
tob.description, u.nickName salesPersonName,
u.nickName salesPersonName, ipkg.itemPackingTypes
ipkg.itemPackingTypes FROM route r
FROM route r JOIN ticket t ON t.routeFk = r.id
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 LEFT JOIN client c ON c.id = t.clientFk
LEFT JOIN client c ON c.id = t.clientFk LEFT JOIN worker w ON w.id = client_getSalesPerson(t.clientFk, CURDATE())
LEFT JOIN worker w ON w.id = client_getSalesPerson(t.clientFk, CURDATE()) LEFT JOIN account.user u ON u.id = w.id
LEFT JOIN account.user u ON u.id = w.id LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 3
LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 3 LEFT JOIN province p ON a.provinceFk = p.id
LEFT JOIN province p ON a.provinceFk = p.id 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 (
LEFT JOIN ( SELECT t.id AS ticketFk,
SELECT t.id AS ticketFk, GROUP_CONCAT(DISTINCT(i.itemPackingTypeFk)) AS itemPackingTypes
GROUP_CONCAT(DISTINCT(i.itemPackingTypeFk)) AS itemPackingTypes FROM route r
FROM route r JOIN ticket t ON t.routeFk = r.id
JOIN ticket t ON t.routeFk = r.id JOIN sale s ON s.ticketFk = t.id
JOIN sale s ON s.ticketFk = t.id JOIN item i ON i.id = s.itemFk
JOIN item i ON i.id = s.itemFk WHERE r.id IN (?)
WHERE r.id IN (?) GROUP BY t.id
GROUP BY t.id ) ipkg ON ipkg.ticketFk = t.id
) ipkg ON ipkg.ticketFk = t.id WHERE r.id IN (?)
WHERE r.id IN (?) ORDER BY t.priority, t.id;
ORDER BY t.priority, t.id;