version 23.22
This commit is contained in:
Sergio De la torre
parent
522fb2109b
commit
eefd86503b
|
|
@ -10,12 +10,12 @@
|
|||
</facet>
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="SELECTED_BUILD_VARIANT" value="alfaDebug" />
|
||||
<option name="SELECTED_BUILD_VARIANT" value="betaDebug" />
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
|
||||
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/alfa/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/src/alfaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/google-services/alfa/debug;file://$MODULE_DIR$/../../../app/build/generated/res/rs/alfa/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/alfa/debug" />
|
||||
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestAlfa/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/src/androidTestAlfaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/alfa/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/alfa/debug" />
|
||||
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/beta/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/src/betaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/google-services/beta/debug;file://$MODULE_DIR$/../../../app/build/generated/res/rs/beta/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/beta/debug" />
|
||||
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestBeta/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/src/androidTestBetaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/beta/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/beta/debug" />
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
|
||||
</configuration>
|
||||
</facet>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -41,21 +41,14 @@
|
|||
</configurations>
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="3b8bed57-fcd9-4c4b-a644-0b0381aae011" name="Default" comment="refs #4678 pasar a picking">
|
||||
<list default="true" id="3b8bed57-fcd9-4c4b-a644-0b0381aae011" name="Default" comment="version Alfa, test pantallas">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.main.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.unitTest.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.unitTest.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/google-services.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/google-services.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/SilexInterceptor.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/SilexInterceptor.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/constraint/group-index.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/group-index.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/test/espresso/group-index.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/test/group-index.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/master-index.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" afterDir="false" />
|
||||
</list>
|
||||
<list id="bb82280e-2612-45ba-bd45-0d90b078e5b6" name="ignore" comment="version23.8Beta accede a warehouse" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
|
|
@ -180,7 +173,7 @@
|
|||
},
|
||||
"keyToStringList": {
|
||||
"ExportApk.BuildVariants": [
|
||||
"alfaRelease"
|
||||
"generalRelease"
|
||||
]
|
||||
}
|
||||
}]]></component>
|
||||
|
|
@ -385,7 +378,14 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1685534874452</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="11" />
|
||||
<task id="LOCAL-00011" summary="version Alfa, test pantallas">
|
||||
<created>1685628814468</created>
|
||||
<option name="number" value="00011" />
|
||||
<option name="presentableId" value="LOCAL-00011" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1685628814468</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="12" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.History.Properties">
|
||||
|
|
@ -432,7 +432,8 @@
|
|||
<MESSAGE value="version23.18Beta" />
|
||||
<MESSAGE value="refs #5618 translate" />
|
||||
<MESSAGE value="refs #4678 pasar a picking" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="refs #4678 pasar a picking" />
|
||||
<MESSAGE value="version Alfa, test pantallas" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="version Alfa, test pantallas" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ android {
|
|||
applicationId "verdnatura.es.repartoverdnatura"
|
||||
minSdkVersion 19
|
||||
//targetSdkVersion 28
|
||||
versionCode 48
|
||||
versionName "23.22Beta"
|
||||
versionCode 49
|
||||
versionName "23.22"
|
||||
// versionName "23.8Beta" versionCode 40
|
||||
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ android {
|
|||
flavorDimensions "version"
|
||||
productFlavors {
|
||||
create("beta") {
|
||||
applicationIdSuffix = ".sfusion"
|
||||
//applicationIdSuffix = ".sfusion"
|
||||
}
|
||||
create("general") {
|
||||
//versionNameSuffix = "General"
|
||||
|
|
@ -37,7 +37,7 @@ android {
|
|||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
getByName("release") {
|
||||
applicationIdSuffix = ".sfusion"
|
||||
// applicationIdSuffix = ".sfusion"
|
||||
}
|
||||
|
||||
getByName("debug") {
|
||||
|
|
|
|||
|
|
@ -342,10 +342,10 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
|
|||
public void onLoadSelected(int pos) {
|
||||
// Intent i = new Intent(this,LoadVanActivity.class);
|
||||
|
||||
Utils.startPicking(this, "summary",listaRutas.get(pos).getId());
|
||||
/* Intent i = new Intent(this, ExpeditionSummaryActivity.class);
|
||||
/* Utils.startPicking(this, "summary",listaRutas.get(pos).getId());*/
|
||||
Intent i = new Intent(this, ExpeditionSummaryActivity.class);
|
||||
i.putExtra("route", listaRutas.get(pos));
|
||||
startActivity(i);*/
|
||||
startActivity(i);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
<string name="cliente">Cliente</string>
|
||||
<string name="consignatorio">Consignatario</string>
|
||||
<string name="consignatorioAbrev">Consign:</string>
|
||||
<string name="packages">Volumes</string>
|
||||
<string name="warehouse">Armazém</string>
|
||||
<string name="packages" translatable="false">Volumes</string>
|
||||
<string name="warehouse" translatable="false">Armazém</string>
|
||||
<string name="volver">voltar</string>
|
||||
<string name="please_wait">trabalhando</string>
|
||||
<string name="error_conexion">erro de conexão</string>
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
<string name="guardar">Salvar</string>
|
||||
<string name="estas_seguro_firma">Tens certeza que queres assinar?</string>
|
||||
<string name="si">Sim</string>
|
||||
<string name="no">Não</string>
|
||||
<string name="no" translatable="false">Não</string>
|
||||
<string name="info">Informação</string>
|
||||
<string name="actualizar">Atualizar</string>
|
||||
<string name="ver_loc">Como queres obter a posição?</string>
|
||||
|
|
@ -69,97 +69,97 @@
|
|||
<string name="packingType">Tipo embalagem:</string>
|
||||
<string name="summaryRouteTitle">Resumo carga rota:</string>
|
||||
<string name="distance">Distancia ao último ponto em que se assinou a descarga em metros:</string>
|
||||
<string name="selecTime">Select Time</string>
|
||||
<string name="expeditionNotFound">Expedición no encontrada</string>
|
||||
<string name="tryAgain">.Vuelva a intentarlo de nuevo</string>
|
||||
<string name="noRows">Sin registros</string>
|
||||
<string name="expedition">Expedición :</string>
|
||||
<string name="scanExpedition">Escanee antes una expedición.</string>
|
||||
<string name="information">Información</string>
|
||||
<string name="markExpeditionFound">¿Desea marcar la expedición como encontrada?</string>
|
||||
<string name="expeditionFound">Expedición no encontrada</string>
|
||||
<string name="optionDeleteExpedition">Esta opción te permite eliminar las expediciones escaneadas.</string>
|
||||
<string name="selecTime">Seleccione Hora</string>
|
||||
<string name="expeditionNotFound">Expedição não encontrada</string>
|
||||
<string name="tryAgain">.Volte a tentar novamente</string>
|
||||
<string name="noRows">Sem registros</string>
|
||||
<string name="expedition">Expedição :</string>
|
||||
<string name="scanExpedition">Escaneie antes uma expedição.</string>
|
||||
<string name="information">Informação</string>
|
||||
<string name="markExpeditionFound">Deseja marcar a expedição como encontrada?</string>
|
||||
<string name="expeditionFound">Expedição não encontrada</string>
|
||||
<string name="optionDeleteExpedition">Esta opção te permite eliminar as expedições escaneadas.</string>
|
||||
<string name="deleting">Eliminando</string>
|
||||
<string name="scanning">Escaneando</string>
|
||||
<string name="loaded"> cargadas</string>
|
||||
<string name="RouteNotInformation">No se ha encontrado información de la ruta</string>
|
||||
<string name="expeditionLoaded">Expedición ya cargada</string>
|
||||
<string name="adressLoaded">Consignatario cargado</string>
|
||||
<string name="expeditionScanFound">Expedición %1$s ya escaneada como encontrada</string>
|
||||
<string name="selectSector">Selecciona sector</string>
|
||||
<string name="mistakeSaving">Error al guarda. Pruebe de nuevo a seleccionar sector</string>
|
||||
<string name="loaded"> carregadas</string>
|
||||
<string name="RouteNotInformation">Não se encontrou informação da rota</string>
|
||||
<string name="expeditionLoaded">Expedição já carregada</string>
|
||||
<string name="adressLoaded">Consignatario carregado</string>
|
||||
<string name="expeditionScanFound">Expedição %1$s já escaneada como encontrada</string>
|
||||
<string name="selectSector">Selecione sector</string>
|
||||
<string name="mistakeSaving">Erro ao salvar. Prove outra vez a selesionar sector</string>
|
||||
<string name="ClientNot">CLIENTE AUSENTE</string>
|
||||
<string name="clientAuthorization">CLIENTE AUTORIZA DESCARGA A REPARTIDOR</string>
|
||||
<string name="clientReject">CLIENTE RECHAZA PEDIDO</string>
|
||||
<string name="packagesMissing">FALTAN BULTOS:</string>
|
||||
<string name="clientDevolution">"RECOGER DEVOLUCIÓN, NÚMERO DE RECLAMACIÓN: "</string>
|
||||
<string name="expeditionsScanned">Expediciones de la ruta y cliente escaneada</string>
|
||||
<string name="expeditionTotal">El total de expediciones escaneadas es diferente al total a entregar. ¿ Quieres guardar las expediciones escaneadas o buscar la/s expedición/es ?</string>
|
||||
<string name="save">GUARDAR</string>
|
||||
<string name="mistakeSending">Error al enviar. Se queda guardado para enviar más tarde</string>
|
||||
<string name="scannerIn">Escáner entregado</string>
|
||||
<string name="expeditionScanned">Expedición ya escaneada para entrega</string>
|
||||
<string name="clientAuthorization">CLIENTE AUTORIZA DESCARGA AO ESTAFETA</string>
|
||||
<string name="clientReject">CLIENTE REJEITA PEDIDO</string>
|
||||
<string name="packagesMissing">FALTAM VOLUMES:</string>
|
||||
<string name="clientDevolution">\"LEVANTAR DEVOLUÇÃO, NUMERO DE RECLAMAÇÃO: \"</string>
|
||||
<string name="expeditionsScanned">Expedições da rota e cliente escaneadas</string>
|
||||
<string name="expeditionTotal">O total de expedições escaneadas é diferente ao total a entregar. Quer salvar expedições escaneadas ou buscar a\as expedições ?</string>
|
||||
<string name="save">SALVAR</string>
|
||||
<string name="mistakeSending">Erro ao enviar. Fica salvo para enviar mais tarde</string>
|
||||
<string name="scannerIn">Scanner entregado</string>
|
||||
<string name="expeditionScanned">Expedição já escaneada para entrega</string>
|
||||
<string name="delivered"> entregadas</string>
|
||||
<string name="scannerComplete">Escaneo a entregar completo</string>
|
||||
<string name="scanned">" escaneadas"</string>
|
||||
<string name="phonePermission">No tienes permisos para llamar.</string>
|
||||
<string name="installMaps">Please install Google Maps</string>
|
||||
<string name="install">Install</string>
|
||||
<string name="alert">Alert</string>
|
||||
<string name="checkUser">Comprobando usuario</string>
|
||||
<string name="newVersion">Existe una nueva versión. Se recomienda actualizar.</string>
|
||||
<string name="update">Actualizar</string>
|
||||
<string name="scannerComplete">Escaneamento a entregar completo</string>
|
||||
<string name="scanned">\" escaneadas\"</string>
|
||||
<string name="phonePermission">Não tens permissão para ligar.</string>
|
||||
<string name="installMaps">Por favor instale Google Maps</string>
|
||||
<string name="install">Instalar</string>
|
||||
<string name="alert">Alerta</string>
|
||||
<string name="checkUser">Comprovando utilizador</string>
|
||||
<string name="newVersion">Existe uma nova versão. Se recomenda atualizar.</string>
|
||||
<string name="update">Atualizar</string>
|
||||
<string name="cancel">Cancelar</string>
|
||||
<string name="newVersionMandatory">Existe una nueva versión. Es necesario actualizar para un correcto funcionamiento</string>
|
||||
<string name="addLog">Añadiendo log</string>
|
||||
<string name="newVersionMandatory">Existe uma nova versão. É necesario atualizar para um correto funcionamento</string>
|
||||
<string name="addLog">Adicionando log</string>
|
||||
<string name="find">BUSCAR</string>
|
||||
<string name="expeditionUnload">Expedición descargada</string>
|
||||
<string name="routeLoaded">Ruta cargada</string>
|
||||
<string name="expeditionUnload">Expedição descarregada</string>
|
||||
<string name="routeLoaded">Rota carregada</string>
|
||||
<string name="addressLoaded">Consignatario cargado</string>
|
||||
<string name="expeditionNotLoaded">Expedición no cargada</string>
|
||||
<string name="optionUnload">Esta opción te permite descargar expediciones de la furgoneta.</string>
|
||||
<string name="unloading">Descargando</string>
|
||||
<string name="loadVan">Cargando furgo</string>
|
||||
<string name="attention">ATENCIÓN</string>
|
||||
<string name="ticketPending">Tienes tickets pendientes de actualizar,¿Estás seguro de cerrar sesión?</string>
|
||||
<string name="yes">Si</string>
|
||||
<string name="not">No</string>
|
||||
<string name="closeSession">Cerrar sesión</string>
|
||||
<string name="sessionExit">¿Estás seguro de cerrar sesión?</string>
|
||||
<string name="forLoading">Para cargar pulsa consignatario</string>
|
||||
<string name="box">Cajas</string>
|
||||
<string name="expeditionNotLoaded">Expedição não carregada</string>
|
||||
<string name="optionUnload">Esta opção te permite descarregar expedições da carrinha.</string>
|
||||
<string name="unloading">Descarregando</string>
|
||||
<string name="loadVan">Carregando carrinha</string>
|
||||
<string name="attention">ATENÇÃO</string>
|
||||
<string name="ticketPending">Tens tickets pendentes de atualizar. Estás seguro de finalizar sessão?</string>
|
||||
<string name="yes">Sim</string>
|
||||
<string name="not">Não</string>
|
||||
<string name="closeSession">Finalizar sesión</string>
|
||||
<string name="sessionExit">Estás seguro de finalizar sessão?</string>
|
||||
<string name="forLoading">Para carregar pressione consignatario</string>
|
||||
<string name="box">Caixas</string>
|
||||
<string name="type">Tipo</string>
|
||||
<string name="lost">Perdidas</string>
|
||||
<string name="deliveredMenu">Entregadas</string>
|
||||
<string name="consignAbbr">Consign</string>
|
||||
<string name="permission">Permite escanear expediciones del consigntario seleccionado</string>
|
||||
<string name="scanExpeditionText">Escanear expedición</string>
|
||||
<string name="permission">Permite escanear expedições do consigntario selecionado</string>
|
||||
<string name="scanExpeditionText">Escanear expedição</string>
|
||||
<string name="markFound">Marcar encontrada</string>
|
||||
<string name="selectRoute">selecciona una ruta</string>
|
||||
<string name="scanHint">Escanear expedición encontrada</string>
|
||||
<string name="route">Ruta</string>
|
||||
<string name="defaultMessages">Mensajes predeterminados:</string>
|
||||
<string name="selectRoute">selecciona uma ruta</string>
|
||||
<string name="scanHint">Escanear expedição encontrada</string>
|
||||
<string name="route">Rota</string>
|
||||
<string name="defaultMessages">Mensagens predeterminadas:</string>
|
||||
<string name="salePerson">Comercial</string>
|
||||
<string name="expedAbbr">Exped:</string>
|
||||
<string name="found">Encontrada</string>
|
||||
<string name="warehouseText">Almacén:</string>
|
||||
<string name="characters">140 carácteres restantes</string>
|
||||
<string name="showLogExpedition">Ver log expedición</string>
|
||||
<string name="agency">Agencia</string>
|
||||
<string name="showExpeditionLog">Escanea expedición para ver log o marcarla encontrada</string>
|
||||
<string name="warehouseText">Armazém:</string>
|
||||
<string name="characters">140 caracteres restantes</string>
|
||||
<string name="showLogExpedition">Ver log expedição</string>
|
||||
<string name="agency">Agência</string>
|
||||
<string name="showExpeditionLog">Escaneie expedição para ver log ou marque-a encontrada</string>
|
||||
<string name="plate">Matrícula</string>
|
||||
<string name="state">Estado</string>
|
||||
<string name="date">Data</string>
|
||||
<string name="nif">NIF:</string>
|
||||
<string name="fiscalAdress">Dirección fiscal:</string>
|
||||
<string name="fiscalAdress">Morada fiscal:</string>
|
||||
<string name="town">Municipio:</string>
|
||||
<string name="postalCode">Código postal:</string>
|
||||
<string name="socialAdress">Razón social:</string>
|
||||
<string name="expeditionFoundScan">Escanea expedición encontrada</string>
|
||||
<string name="socialAdress">Razão social:</string>
|
||||
<string name="expeditionFoundScan">Escanear expedição encontrada</string>
|
||||
<string name="routeAbbrev">R:</string>
|
||||
<string name="consigneeAbrev">C:</string>
|
||||
<string name="scanAbrev">Escan</string>
|
||||
<string name="selectOne">(selecciona uno)</string>
|
||||
<string name="selectOne">(seleccione um)</string>
|
||||
<string name="buttonOk">OK</string>
|
||||
<string name="m3">M3</string>
|
||||
<string name="pc">PC</string>
|
||||
|
|
|
|||
Loading…
Reference in New Issue