7226-testToMaster_2416 #2320

Merged
alexm merged 188 commits from 7226-testToMaster_2416 into master 2024-04-18 05:39:36 +00:00
4 changed files with 71 additions and 63 deletions
Showing only changes of commit de5e954ce2 - Show all commits

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;
} }

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>

View File

@ -1,5 +1,4 @@
SELECT SELECT r.id,
r.id,
r.m3, r.m3,
r.created, r.created,
r.time, r.time,
@ -7,7 +6,7 @@ SELECT
v.tradeMark vehicleTradeMark, v.tradeMark vehicleTradeMark,
v.model vehicleModel, v.model vehicleModel,
v.numberPlate plateNumber, v.numberPlate plateNumber,
IFNULL(s.name, am.name) AS agencyName IFNULL(s.name, am.name) 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

View File

@ -1,20 +1,19 @@
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) AS phone, if(a.phone, a.phone, c.phone) phone,
if(a.mobile, a.mobile, c.mobile) AS mobile, if(a.mobile, a.mobile, c.mobile) mobile,
wh.name warehouseName, wh.name warehouseName,
a.city, a.city,
a.street, a.street,
a.postalCode, a.postalCode,
LPAD(a.id, 5, '0') AS addressFk, LPAD(a.id, 5, '0') addressFk,
p.name province, p.name province,
0 AS import, 0 import,
am.name ticketAgency, am.name ticketAgency,
tob.description, tob.description,
u.nickName salesPersonName, u.nickName salesPersonName,