si el pedido esta confirmado no puede añadir mas lineas

This commit is contained in:
quique 2019-02-14 13:12:36 +01:00
parent d46809d82e
commit 84e4948795
73 changed files with 275 additions and 852 deletions

File diff suppressed because it is too large Load Diff

View File

@ -14,8 +14,8 @@ android {
applicationId "com.verdnatura.verdnaturaventas" applicationId "com.verdnatura.verdnaturaventas"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 27 targetSdkVersion 27
versionCode 87 versionCode 89
versionName "1.9.0" versionName "1.9.2"
multiDexEnabled true multiDexEnabled true
} }

View File

@ -8,6 +8,6 @@ public final class BuildConfig {
public static final String APPLICATION_ID = "com.verdnatura.verdnaturaventas"; public static final String APPLICATION_ID = "com.verdnatura.verdnaturaventas";
public static final String BUILD_TYPE = "debug"; public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = ""; public static final String FLAVOR = "";
public static final int VERSION_CODE = 87; public static final int VERSION_CODE = 89;
public static final String VERSION_NAME = "1.9.0"; public static final String VERSION_NAME = "1.9.2";
} }

View File

@ -8,6 +8,6 @@ public final class BuildConfig {
public static final String APPLICATION_ID = "com.verdnatura.verdnaturaventas"; public static final String APPLICATION_ID = "com.verdnatura.verdnaturaventas";
public static final String BUILD_TYPE = "release"; public static final String BUILD_TYPE = "release";
public static final String FLAVOR = ""; public static final String FLAVOR = "";
public static final int VERSION_CODE = 87; public static final int VERSION_CODE = 89;
public static final String VERSION_NAME = "1.9.0"; public static final String VERSION_NAME = "1.9.2";
} }

View File

@ -1 +1 @@
[{"type":"MAIN","splits":[],"versionCode":87,"versionName":"1.9.0","enabled":true,"outputFile":"verdnaturaventas-debug.apk","fullName":"debug","baseName":"debug"}] [{"type":"MAIN","splits":[],"versionCode":89,"versionName":"1.9.2","enabled":true,"outputFile":"verdnaturaventas-debug.apk","fullName":"debug","baseName":"debug"}]

View File

@ -1 +1 @@
[{"type":"MAIN","splits":[],"versionCode":87,"versionName":"1.9.0","enabled":true,"outputFile":"verdnaturaventas-release.apk","fullName":"release","baseName":"release"}] [{"type":"MAIN","splits":[],"versionCode":89,"versionName":"1.9.2","enabled":true,"outputFile":"verdnaturaventas-release.apk","fullName":"release","baseName":"release"}]

View File

@ -1,4 +1,4 @@
#Thu Feb 14 07:55:51 CET 2019 #Thu Feb 14 13:09:56 CET 2019
path.2=classes3.dex path.2=classes3.dex
path.1=classes2.dex path.1=classes2.dex
path.0=classes.dex path.0=classes.dex

View File

@ -1,5 +1,5 @@
#Internal package file, do not edit. #Internal package file, do not edit.
#Thu Feb 14 07:55:52 CET 2019 #Thu Feb 14 13:09:57 CET 2019
17.baseType=DIRECTORY 17.baseType=DIRECTORY
4.path=lib/armeabi/libzbarjni.so 4.path=lib/armeabi/libzbarjni.so
25.base=/Users/enriqueblascoblanquer/Documents/ANDROID/APPVENTAS/vn-sales/verdnaturaventas/build/intermediates/transforms/mergeJniLibs/debug/0 25.base=/Users/enriqueblascoblanquer/Documents/ANDROID/APPVENTAS/vn-sales/verdnaturaventas/build/intermediates/transforms/mergeJniLibs/debug/0

View File

@ -1,4 +1,4 @@
#Thu Feb 14 07:57:34 CET 2019 #Thu Feb 14 13:07:55 CET 2019
base.0=/Users/enriqueblascoblanquer/Documents/ANDROID/APPVENTAS/vn-sales/verdnaturaventas/build/intermediates/transforms/dexMerger/release/0 base.0=/Users/enriqueblascoblanquer/Documents/ANDROID/APPVENTAS/vn-sales/verdnaturaventas/build/intermediates/transforms/dexMerger/release/0
path.1=classes2.dex path.1=classes2.dex
renamed.1=classes2.dex renamed.1=classes2.dex

View File

@ -1,5 +1,5 @@
#Internal package file, do not edit. #Internal package file, do not edit.
#Thu Feb 14 07:57:35 CET 2019 #Thu Feb 14 13:07:56 CET 2019
17.baseType=DIRECTORY 17.baseType=DIRECTORY
4.path=fonts/Roboto-Bold.ttf 4.path=fonts/Roboto-Bold.ttf
25.base=/Users/enriqueblascoblanquer/Documents/ANDROID/APPVENTAS/vn-sales/verdnaturaventas/build/intermediates/transforms/mergeJniLibs/release/0 25.base=/Users/enriqueblascoblanquer/Documents/ANDROID/APPVENTAS/vn-sales/verdnaturaventas/build/intermediates/transforms/mergeJniLibs/release/0

View File

@ -1 +1 @@
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":87,"versionName":"1.9.0","enabled":true,"outputFile":"verdnaturaventas-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.verdnatura.verdnaturaventas","split":"","minSdkVersion":"19"}}] [{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":89,"versionName":"1.9.2","enabled":true,"outputFile":"verdnaturaventas-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.verdnatura.verdnaturaventas","split":"","minSdkVersion":"19"}}]

View File

@ -1 +1 @@
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":87,"versionName":"1.9.0","enabled":true,"outputFile":"verdnaturaventas-release.apk","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.verdnatura.verdnaturaventas","split":"","minSdkVersion":"19"}}] [{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":89,"versionName":"1.9.2","enabled":true,"outputFile":"verdnaturaventas-release.apk","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.verdnatura.verdnaturaventas","split":"","minSdkVersion":"19"}}]

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.verdnatura.verdnaturaventas" package="com.verdnatura.verdnaturaventas"
android:versionCode="87" android:versionCode="89"
android:versionName="1.9.0" > android:versionName="1.9.2" >
<uses-sdk <uses-sdk
android:minSdkVersion="19" android:minSdkVersion="19"

View File

@ -1 +1 @@
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":87,"versionName":"1.9.0","enabled":true,"outputFile":"verdnaturaventas-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.verdnatura.verdnaturaventas","split":"","minSdkVersion":"19"}}] [{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":89,"versionName":"1.9.2","enabled":true,"outputFile":"verdnaturaventas-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.verdnatura.verdnaturaventas","split":"","minSdkVersion":"19"}}]

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.verdnatura.verdnaturaventas" package="com.verdnatura.verdnaturaventas"
android:versionCode="87" android:versionCode="89"
android:versionName="1.9.0" > android:versionName="1.9.2" >
<uses-sdk <uses-sdk
android:minSdkVersion="19" android:minSdkVersion="19"

View File

@ -1 +1 @@
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":87,"versionName":"1.9.0","enabled":true,"outputFile":"verdnaturaventas-release.apk","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.verdnatura.verdnaturaventas","split":"","minSdkVersion":"19"}}] [{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":89,"versionName":"1.9.2","enabled":true,"outputFile":"verdnaturaventas-release.apk","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.verdnatura.verdnaturaventas","split":"","minSdkVersion":"19"}}]

View File

@ -1 +1 @@
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":87,"versionName":"1.9.0","enabled":true,"outputFile":"verdnaturaventas-debug.apk","fullName":"debug","baseName":"debug"},"path":"resources-debug.ap_","properties":{"packageId":"com.verdnatura.verdnaturaventas","split":"","minSdkVersion":"19"}}] [{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":89,"versionName":"1.9.2","enabled":true,"outputFile":"verdnaturaventas-debug.apk","fullName":"debug","baseName":"debug"},"path":"resources-debug.ap_","properties":{"packageId":"com.verdnatura.verdnaturaventas","split":"","minSdkVersion":"19"}}]

View File

@ -1 +1 @@
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":87,"versionName":"1.9.0","enabled":true,"outputFile":"verdnaturaventas-release.apk","fullName":"release","baseName":"release"},"path":"resources-release.ap_","properties":{"packageId":"com.verdnatura.verdnaturaventas","split":"","minSdkVersion":"19"}}] [{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":89,"versionName":"1.9.2","enabled":true,"outputFile":"verdnaturaventas-release.apk","fullName":"release","baseName":"release"},"path":"resources-release.ap_","properties":{"packageId":"com.verdnatura.verdnaturaventas","split":"","minSdkVersion":"19"}}]

View File

@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":87,"versionName":"1.9.0","enabled":true,"outputFile":"verdnaturaventas-debug.apk","fullName":"debug","baseName":"debug"},"path":"verdnaturaventas-debug.apk","properties":{}}] [{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":89,"versionName":"1.9.2","enabled":true,"outputFile":"verdnaturaventas-debug.apk","fullName":"debug","baseName":"debug"},"path":"verdnaturaventas-debug.apk","properties":{}}]

View File

@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none';
<span class="mdl-layout-title">Lint Report: 2 errors</span> <span class="mdl-layout-title">Lint Report: 2 errors</span>
<div class="mdl-layout-spacer"></div> <div class="mdl-layout-spacer"></div>
<nav class="mdl-navigation mdl-layout--large-screen-only"> <nav class="mdl-navigation mdl-layout--large-screen-only">
Check performed at Thu Feb 14 07:57:11 CET 2019 </nav> Check performed at Thu Feb 14 13:07:41 CET 2019 </nav>
</div> </div>
</header> </header>
<div class="mdl-layout__drawer"> <div class="mdl-layout__drawer">

View File

@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":87,"versionName":"1.9.0","enabled":true,"outputFile":"verdnaturaventas-release.apk","fullName":"release","baseName":"release"},"path":"verdnaturaventas-release.apk","properties":{}}] [{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":89,"versionName":"1.9.2","enabled":true,"outputFile":"verdnaturaventas-release.apk","fullName":"release","baseName":"release"},"path":"verdnaturaventas-release.apk","properties":{}}]

View File

@ -271,6 +271,7 @@ public class ControllerPedido{
Toast.makeText(this.activity.getBaseContext(),"Error al finalizar,vuelva a intentar.",Toast.LENGTH_LONG).show(); Toast.makeText(this.activity.getBaseContext(),"Error al finalizar,vuelva a intentar.",Toast.LENGTH_LONG).show();
} }
} }
public void reiniciarPedido() public void reiniciarPedido()

View File

@ -245,12 +245,21 @@ public class DialogComprar extends DialogBase{
@Override @Override
public void Realice(CommandBase cmd) { public void Realice(CommandBase cmd) {
pedido.setOrder(((CmdCrearOrder)cmd).getOrder()); pedido.setOrder(((CmdCrearOrder)cmd).getOrder());
if (pedido.getOrder().getId() == 0){
Toast.makeText(activity, "Error al añadir la linea,vuelva a intentar.",Toast.LENGTH_LONG).show();
pedido.reiniciarPedido();
}else{
pedido.guardarOrder(); pedido.guardarOrder();
Toast.makeText(activity, activity.getResources().getString(R.string.activity_articulo_producto_anyadido), Toast.LENGTH_SHORT).show(); Toast.makeText(activity, activity.getResources().getString(R.string.activity_articulo_producto_anyadido), Toast.LENGTH_SHORT).show();
activity.showTotalPedido(); activity.showTotalPedido();
activity.showCarritoRows(); activity.showCarritoRows();
DialogComprar.this.dismiss(); DialogComprar.this.dismiss();
} }
}
}); });
cmd.setErrorManager(new CommandError() { cmd.setErrorManager(new CommandError() {
@Override @Override

View File

@ -67,6 +67,7 @@ public class DialogValidarPedido extends DialogBase {
if(tieneCredito) if(tieneCredito)
{ {
pedido.showFinalizar(false, true); pedido.showFinalizar(false, true);
this.dismiss(); this.dismiss();
} }
else else