diff --git a/db/changes/10100-AllSaints/01-zone_getLanded.sql b/db/changes/10100-AllSaints/01-zone_getLanded.sql index 8867235e7..6a4e24197 100644 --- a/db/changes/10100-AllSaints/01-zone_getLanded.sql +++ b/db/changes/10100-AllSaints/01-zone_getLanded.sql @@ -23,7 +23,9 @@ BEGIN ENGINE = MEMORY SELECT vWarehouseFk warehouseFk, TIMESTAMPADD(DAY,zo.travelingDays, vShipped) landed, - zo.zoneFk + vShipped shipped, + zo.zoneFk, + z.agencyModeFk FROM tmp.zoneOption zo JOIN zone z ON z.id = zo.zoneFk WHERE agencyModeFk = vAgencyModeFk; @@ -34,4 +36,4 @@ BEGIN END$$ -DELIMITER ; +DELIMITER ; \ No newline at end of file diff --git a/db/changes/10100-AllSaints/01-zone_getShippedWarehouse.sql b/db/changes/10100-AllSaints/01-zone_getShippedWarehouse.sql index ffaebdbd5..017b7d17c 100644 --- a/db/changes/10100-AllSaints/01-zone_getShippedWarehouse.sql +++ b/db/changes/10100-AllSaints/01-zone_getShippedWarehouse.sql @@ -23,9 +23,12 @@ BEGIN SELECT * FROM ( SELECT zo.zoneFk, TIMESTAMPADD(DAY,-zo.travelingDays, vLanded) shipped, - zw.warehouseFk + zw.warehouseFk, + z.agencyModeFk FROM tmp.zoneOption zo JOIN zoneWarehouse zw ON zw.zoneFk = zo.zoneFk + JOIN zone z ON z.id = zo.zoneFk + WHERE z.agencyModeFk = vAgencyModeFk ORDER BY shipped) t GROUP BY warehouseFk; diff --git a/modules/ticket/front/basic-data/step-one/index.html b/modules/ticket/front/basic-data/step-one/index.html index 0b413d7fb..b98267a85 100644 --- a/modules/ticket/front/basic-data/step-one/index.html +++ b/modules/ticket/front/basic-data/step-one/index.html @@ -1,6 +1,5 @@ @@ -86,7 +85,7 @@ ng-model="$ctrl.zoneId" vn-acl="productionBoss"> - {{::name}} - {{::warehouse.name}} - Max. {{::hour | date: 'HH:mm'}} h. + {{::name}} - Max. {{::hour | date: 'HH:mm'}} h.