160920

Fix: Edit portfolio.

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -682,11 +682,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesDB.m"
-            timestampString = "495969606.502468"
+            timestampString = "496029310.803276"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "698"
-            endingLineNumber = "698"
+            startingLineNumber = "724"
+            endingLineNumber = "724"
             landmarkName = "+initializeDb"
             landmarkType = "5">
          </BreakpointContent>
@@ -698,11 +698,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesDB.m"
-            timestampString = "495969606.502468"
+            timestampString = "496029310.803276"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "740"
-            endingLineNumber = "740"
+            startingLineNumber = "766"
+            endingLineNumber = "766"
             landmarkName = "+initializeDb"
             landmarkType = "5">
          </BreakpointContent>
@@ -771,5 +771,213 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/data_provider/iSalesDB.m"
+            timestampString = "496029310.803276"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "666"
+            endingLineNumber = "666"
+            landmarkName = "+initializeDb"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/data_provider/iSalesDB.m"
+            timestampString = "496028986.4012"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "373"
+            endingLineNumber = "373"
+            landmarkName = "+get_db"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/portfolio/PortfolioViewController.m"
+            timestampString = "496034299.267548"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "734"
+            endingLineNumber = "734"
+            landmarkName = "-onEditClick:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/portfolio/PortfolioEditQTYViewController.m"
+            timestampString = "496034712.24113"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "256"
+            endingLineNumber = "256"
+            landmarkName = "-onSaveClick:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/data_provider/iSalesNetwork.m"
+            timestampString = "496034998.69415"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "2016"
+            endingLineNumber = "2016"
+            landmarkName = "+portfolio_setPrice:price:discount:QTY:qty_p:notes:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/portfolio/PortfolioViewController.m"
+            timestampString = "496035049.795749"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "740"
+            endingLineNumber = "740"
+            landmarkName = "-onEditClick:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/portfolio/PortfolioEditQTYViewController.m"
+            timestampString = "496035213.137209"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "235"
+            endingLineNumber = "235"
+            landmarkName = "-onSaveClick:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/portfolio/PortfolioEditQTYViewController.m"
+            timestampString = "496035610.216268"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "380"
+            endingLineNumber = "380"
+            landmarkName = "-update_newprice"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/portfolio/PortfolioViewController.m"
+            timestampString = "496035976.49132"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "624"
+            endingLineNumber = "624"
+            landmarkName = "-onEditClick:"
+            landmarkType = "5">
+            <Locations>
+               <Location
+                  shouldBeEnabled = "No"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[PortfolioViewController onEditClick:]"
+                  moduleName = "NPD Mobile"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///ios_workspace/RedAnt%20ERP%20Mobile/common/Functions/portfolio/PortfolioViewController.m"
+                  timestampString = "496035976.494074"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "624"
+                  endingLineNumber = "624"
+                  offsetFromSymbolStart = "2699">
+               </Location>
+               <Location
+                  shouldBeEnabled = "No"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__39-[PortfolioViewController onEditClick:]_block_invoke"
+                  moduleName = "NPD Mobile"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///ios_workspace/RedAnt%20ERP%20Mobile/common/Functions/portfolio/PortfolioViewController.m"
+                  timestampString = "496035976.494322"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "624"
+                  endingLineNumber = "624"
+                  offsetFromSymbolStart = "48">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/portfolio/PortfolioViewController.m"
+            timestampString = "496035980.127329"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "627"
+            endingLineNumber = "627"
+            landmarkName = "-onEditClick:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/portfolio/PortfolioViewController.m"
+            timestampString = "496035987.127972"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "633"
+            endingLineNumber = "633"
+            landmarkName = "-onEditClick:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/portfolio/PortfolioEditQTYViewController.m

@@ -217,19 +217,19 @@
     
     if(self.editQTY.text.length==0)
     {
-        self.qty=-1;
-        self.qty_p=-1;
+        self.qty=-INT32_MAX;
+        self.qty_p=-MAXFLOAT;
     }
     else
         if(qtypercentage)
         {
             self.qty_p=[self.editQTY.text floatValue];
-            self.qty=-1;
+            self.qty=-INT32_MAX;
         }
     else
     {
         self.qty=[self.editQTY.text intValue];
-        self.qty_p=-1;
+        self.qty_p=-MAXFLOAT;
     }
     
     if (!self.qtyCheckButton.selected) {
@@ -366,9 +366,20 @@
 -(void) update_newprice
 {
     
-    self.price = [self.editPrice.text doubleValue];
+    if (!self.priceCheckButton.selected) {
+        self.price = -MAXFLOAT;
+    }
+    else
+        self.price = [self.editPrice.text doubleValue];
+    
+    if (!self.discountCheckButton.selected) {
+        self.discount = -MAXFLOAT;
+    }
+    else
+        self.discount = [self.editDiscount.text doubleValue];
+    
+    
     
-    self.discount = [self.editDiscount.text doubleValue];
     
     
     self.labelNewPrice.text = [NSString stringWithFormat:@"%.2f",self.price* (1.0-self.discount/100)];

RedAnt ERP Mobile/common/Functions/portfolio/PortfolioViewController.m

@@ -737,7 +737,7 @@
                 
                 NSDictionary* cart_json = nil;
                 
-                cart_json= [iSalesNetwork portfolio_setPrice:ids price:-1 discount:discount QTY:qty qty_p:qty_p notes:notes];
+                cart_json= [iSalesNetwork portfolio_setPrice:ids price:price discount:discount QTY:qty qty_p:qty_p notes:notes];
                 
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];

RedAnt ERP Mobile/common/data_provider/iSalesDB.m

@@ -367,7 +367,8 @@ void decryptfield (sqlite3_context *context, int argc, sqlite3_value **argv) {
 + (sqlite3*) get_db
 {
     
-    
+//    if(![dblock tryLock])
+//        return nil;
     
     [dblock lock];
     
@@ -611,6 +612,9 @@ void decryptfield (sqlite3_context *context, int argc, sqlite3_value **argv) {
     count_dbconn=0;
     
     
+    
+    
+    
     //count_tmpdbconn=0;
     //    return false;
     //
@@ -634,6 +638,28 @@ void decryptfield (sqlite3_context *context, int argc, sqlite3_value **argv) {
     if(dblock==nil)
         dblock=  [[NSLock alloc] init];
     
+//    /* test dblock in thread*/
+//    for(int i=0;i<50;i++)
+//
+//    {
+//        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+//            
+//            NSLog(@"%d is running",i);
+//            sqlite3* testdb = [self get_db];
+//            
+//            int sec=arc4random() % 10;
+//            NSLog(@"%d is processing, will take %d sec",i,sec);
+//            sleep(sec);
+//            [self close_db:testdb];
+//            
+//            NSLog(@"%d is finish",i);
+//            
+//            
+//        });
+//    }
+//    
+    
+    
     
     //    [iSalesDB execSql:@"PRAGMA journal_mode = DELETE;"];
     

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -1326,7 +1326,7 @@ repeat:
         if(![self IsNetworkAvailable])
             return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
         
-        if([request_url isEqualToString:URL_CARTDELIVERY])
+        if([request_url isEqualToString:URL_CARTDELIVERY]||[request_url isEqualToString:URL_REQUEST_DM])
         {
             NSError *error=nil;