Release 0.7.1

Merge pull request #214 from vrlkacha/0.7.1
automint · Sep 6, 2016 · 258b31a · 258b31a
2 parents e5fb2f7 + 0706b6c
commit 258b31a
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,5 +62,5 @@ src/typings/
 app.asar.unpacked/
 
 # Dev Dependencies from @ndkcha
-src/app/automint.js
+src/app/automint*.js
 nd_tests/
diff --git a/src/app/app.service.js b/src/app/app.service.js
@@ -435,7 +435,7 @@
                                 var payreceived = (service.partialpayment) ? service.partialpayment.total : ((service.status == "paid") ? service.cost : 0);
                                 cd = angular.lowercase(cd).replace(' ', '-');
                                 if (service._deleted == true) {
-                                    if (cachedoc[cd][sId] != undefined)
+                                    if (cachedoc[cd] && cachedoc[cd][sId] != undefined)
                                         isChanged = true;
                                     return;
                                 }

diff --git a/src/app/components/customers/customers-add.controller.js b/src/app/components/customers/customers-add.controller.js
@@ -217,7 +217,7 @@
         }
 
         function checkExistingCustomerMobile(ev) {
-            if (vm.user.mobile == '')
+            if (vm.user.mobile == undefined || vm.user.mobile == '')
                 return;
             vm.loadingBasedOnMobile = true;
             amCustomers.getCustomerByMobile(vm.user.mobile).then(success).catch(failure);

diff --git a/src/app/components/customers/customers-edit.controller.js b/src/app/components/customers/customers-edit.controller.js
@@ -96,7 +96,7 @@
 
 
         function checkExistingCustomerMobile(ev) {
-            if (vm.user.mobile == '')
+            if (vm.user.mobile == undefined || vm.user.mobile == '')
                 return;
             vm.loadingBasedOnMobile = true;
             amCustomers.getCustomerByMobile(vm.user.mobile).then(success).catch(failure);

diff --git a/src/app/components/services/services-add.controller.js b/src/app/components/services/services-add.controller.js
@@ -1599,6 +1599,8 @@
 
         //  change user based on mobile number
         function selectUserBasedOnMobile() {
+            if (vm.user.mobile == undefined)
+                return;
             if (vm.user.mobile != '' && (vm.user.id == '' || flagGetUserBasedOnMobile)) {
                 vm.changeUserMobile(false);
                 vm.loadingBasedOnMobile = true;

diff --git a/src/app/components/services/services-edit.controller.js b/src/app/components/services/services-edit.controller.js
@@ -273,7 +273,7 @@
         }
 
         function selectUserBasedOnMobile() {
-            if (vm.user.mobile != '') {
+            if (vm.user.mobile != undefined || vm.user.mobile != '') {
                 vm.loadingBasedOnMobile = true;
                 amServices.getCustomerByMobile(vm.user.mobile).then(success).catch(failure);
             }

diff --git a/src/app/login/login.service.js b/src/app/login/login.service.js
@@ -156,7 +156,7 @@
                     isLoggedIn = true;
                 if ((res.data.code != undefined) && (res.data.code == 13))
                     processMintCode(-404);
-                amLogin.saveActivationDetails(vm.code, res.data.starts, res.data.ends).then(proceed).catch(failure);
+                amLogin.saveActivationDetails(code, res.data.starts, res.data.ends).then(proceed).catch(failure);
             }
 
             function success(res) {

diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Automint",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "CRM by Automint",
   "main": "main.js",
   "scripts": {