161102

Change:
prepare_portfolio_data support create sync pdf by parameters

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

@@ -58,11 +58,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "139"
-            endingLineNumber = "139"
+            startingLineNumber = "142"
+            endingLineNumber = "142"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -90,11 +90,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "386"
-            endingLineNumber = "386"
+            startingLineNumber = "425"
+            endingLineNumber = "425"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -106,11 +106,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "150"
-            endingLineNumber = "150"
+            startingLineNumber = "153"
+            endingLineNumber = "153"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -154,11 +154,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "385"
-            endingLineNumber = "385"
+            startingLineNumber = "424"
+            endingLineNumber = "424"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -186,11 +186,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "399"
-            endingLineNumber = "399"
+            startingLineNumber = "438"
+            endingLineNumber = "438"
             landmarkName = "+get_pdftemplate:"
             landmarkType = "7">
          </BreakpointContent>
@@ -202,11 +202,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499586689.458793"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "432"
-            endingLineNumber = "432"
+            startingLineNumber = "471"
+            endingLineNumber = "471"
             landmarkName = "+offline_request_tearsheet:"
             landmarkType = "7">
          </BreakpointContent>
@@ -218,11 +218,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "137"
-            endingLineNumber = "137"
+            startingLineNumber = "140"
+            endingLineNumber = "140"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
             <Locations>
@@ -330,11 +330,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "178"
-            endingLineNumber = "178"
+            startingLineNumber = "186"
+            endingLineNumber = "186"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -346,11 +346,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "146"
-            endingLineNumber = "146"
+            startingLineNumber = "149"
+            endingLineNumber = "149"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -362,11 +362,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "159"
-            endingLineNumber = "159"
+            startingLineNumber = "166"
+            endingLineNumber = "166"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -378,11 +378,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "260"
-            endingLineNumber = "260"
+            startingLineNumber = "324"
+            endingLineNumber = "324"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -394,11 +394,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "263"
-            endingLineNumber = "263"
+            startingLineNumber = "327"
+            endingLineNumber = "327"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -570,12 +570,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499586689.458793"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10377"
-            endingLineNumber = "10377"
-            landmarkName = "+offline_pdfList:"
+            startingLineNumber = "10418"
+            endingLineNumber = "10418"
+            landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -586,11 +586,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499586689.458793"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "443"
-            endingLineNumber = "443"
+            startingLineNumber = "482"
+            endingLineNumber = "482"
             landmarkName = "+offline_request_tearsheet:"
             landmarkType = "7">
          </BreakpointContent>
@@ -634,11 +634,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499586689.458793"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10342"
-            endingLineNumber = "10342"
+            startingLineNumber = "10383"
+            endingLineNumber = "10383"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -650,11 +650,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499586689.458793"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10171"
-            endingLineNumber = "10171"
+            startingLineNumber = "10210"
+            endingLineNumber = "10210"
             landmarkName = "+offline_portfolioList:"
             landmarkType = "7">
          </BreakpointContent>
@@ -666,11 +666,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499586689.458793"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10273"
-            endingLineNumber = "10273"
+            startingLineNumber = "10314"
+            endingLineNumber = "10314"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -678,15 +678,15 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499586689.458793"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10313"
-            endingLineNumber = "10313"
+            startingLineNumber = "10354"
+            endingLineNumber = "10354"
             landmarkName = "+offline_savePDF:direct:"
             landmarkType = "7">
          </BreakpointContent>
@@ -698,11 +698,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/portfolio/PDFListViewController.m"
-            timestampString = "499328712.807323"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "502"
-            endingLineNumber = "502"
+            startingLineNumber = "517"
+            endingLineNumber = "517"
             landmarkName = "-tableView:didSelectRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -714,11 +714,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/portfolio/PDFListViewController.m"
-            timestampString = "499328717.31357"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "507"
-            endingLineNumber = "507"
+            startingLineNumber = "522"
+            endingLineNumber = "522"
             landmarkName = "-tableView:didSelectRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -794,27 +794,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "329"
-            endingLineNumber = "329"
-            landmarkName = "+prepare_portfolio_data:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "180"
-            endingLineNumber = "180"
+            startingLineNumber = "188"
+            endingLineNumber = "188"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -826,11 +810,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "181"
-            endingLineNumber = "181"
+            startingLineNumber = "189"
+            endingLineNumber = "189"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -842,11 +826,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "182"
-            endingLineNumber = "182"
+            startingLineNumber = "190"
+            endingLineNumber = "190"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -858,11 +842,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499568343.756337"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "309"
-            endingLineNumber = "309"
+            startingLineNumber = "373"
+            endingLineNumber = "373"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -906,11 +890,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499585251.922996"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "401"
-            endingLineNumber = "401"
+            startingLineNumber = "440"
+            endingLineNumber = "440"
             landmarkName = "+get_pdftemplate:"
             landmarkType = "7">
          </BreakpointContent>
@@ -950,15 +934,15 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499588100.161951"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "131"
-            endingLineNumber = "131"
+            startingLineNumber = "134"
+            endingLineNumber = "134"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -970,11 +954,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499588397.473613"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "157"
-            endingLineNumber = "157"
+            startingLineNumber = "161"
+            endingLineNumber = "161"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -986,11 +970,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499588440.259254"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "338"
-            endingLineNumber = "338"
+            startingLineNumber = "377"
+            endingLineNumber = "377"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1002,11 +986,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499588459.934208"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "195"
-            endingLineNumber = "195"
+            startingLineNumber = "216"
+            endingLineNumber = "216"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1066,11 +1050,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "499759589.353113"
+            timestampString = "499833928.148544"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "262"
-            endingLineNumber = "262"
+            startingLineNumber = "326"
+            endingLineNumber = "326"
             landmarkName = "+prepare_portfolio_data:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1123,5 +1107,53 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "499833928.148544"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "10463"
+            endingLineNumber = "10463"
+            landmarkName = "+offline_pdfList:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/portfolio/PDFListViewController.m"
+            timestampString = "499833928.148544"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "511"
+            endingLineNumber = "511"
+            landmarkName = "-tableView:didSelectRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/data_provider/iSalesNetwork.m"
+            timestampString = "499831730.155216"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1476"
+            endingLineNumber = "1476"
+            landmarkName = "+create_portfolio:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -127,6 +127,9 @@
 }
 +(NSMutableDictionary*) prepare_portfolio_data:(NSMutableDictionary*) params
 {
+    
+    
+    NSMutableDictionary* values=params[@"replaceValue"];
     //生成portfolio pdf需要的数据
     NSMutableDictionary* data = [[NSMutableDictionary alloc]init];
     data[@"npd_url"]=@"www.newpacificdirect.com";
@@ -155,10 +158,15 @@
      //   [dic setValue:[NSNumber numberWithInteger:RESULT_TRUE] forKey:@"result"];
         
         int product_id = sqlite3_column_int(stmt, 0);
+         
+         
+
+         
  //       NSString *product_id_string = [NSString stringWithFormat:@"%d",product_id];
         NSString *name = [self textAtColumn:1 statement:stmt];
         NSString *description = [self textAtColumn:2 statement:stmt];
         double price = sqlite3_column_double(stmt, 3);
+         NSString *s_price = [self textAtColumn:3 statement:stmt];
         double discount = sqlite3_column_double(stmt,4);
         int qty = sqlite3_column_int(stmt, 5);
         NSString *s_qty = [self textAtColumn:5 statement:stmt];
@@ -191,6 +199,19 @@
         NSString *fabric_content = [self textAtColumn:23 statement:stmt];
         NSString *assembling = [self textAtColumn:24 statement:stmt];
         NSString *made_in = [self textAtColumn:25 statement:stmt];
+         
+         
+         
+NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:item_id   price:[params[@"regular_price"] intValue] db:db];
+         
+         
+         
+
+         
+
+         
+         
+         
 
         if(is_percentage==0&&qty==0&&!show_stockout)
         {
@@ -210,6 +231,49 @@
         {
             percent=1;
         }
+         
+         qty=qty*percent+0.5;
+         
+         
+         for(int i=0;i<[values[@"count"] intValue];i++)
+         {
+             NSMutableDictionary * valueitem=values[[NSString stringWithFormat:@"item_%d",i]];
+             if([valueitem[@"product_id"] intValue]==product_id)
+             {
+                 line_note=valueitem[@"linenotes"];
+                 qty=[valueitem[@"available_qty"] intValue];
+                 s_qty=valueitem[@"available_qty"] ;
+                 gprice=valueitem[@"regular_price"];
+                 s_price=valueitem[@"special_price"];
+                 price=[valueitem[@"special_price"] floatValue];
+                 
+             }
+         }
+         
+         
+         
+         NSString* set_price=@"";
+         
+         if ([s_price isEqualToString:@"null"]) {
+             
+         }
+         else
+         {
+             set_price=[NSString stringWithFormat:@"Special: $ %.2f",price*(1-discount/100.0)];
+         }
+         NSString* get_price=@"";
+         {
+             
+             //            NSNumber* price = [self get_model_default_price:appDelegate.contact_id product_id:nil item_id:@(item_id) db:db];
+             
+             
+             //                DebugLog(@"price time interval");
+             //                [self printTimeIntervalBetween:price_date and:[NSDate date]];
+             if(gprice==nil)
+                 get_price=@"Price:No Price.";
+             else
+                 get_price=[NSString stringWithFormat:@"Price: $ %@",gprice];
+         }
 //        NSString *qty_null = [self textAtColumn:5 statement:stmt];
 //        if ([qty_null isEqualToString:@"null"]) {
 //            qty=availability;
@@ -220,7 +284,7 @@
 //            percentage=1;
 //        }
         
-        NSString * str_availability=[NSString stringWithFormat:@"<b>Availability:</b> %d",(int)(qty*percent+0.5)];
+        NSString * str_availability=[NSString stringWithFormat:@"<b>Availability:</b> %d",(int)qty];
         NSString * str_color=[NSString stringWithFormat:@"<b>Color:</b> %@",color];
         NSString * str_model_set=[NSString stringWithFormat:@"<b>Set:</b> Sold in QTY of %d",model_set];
         NSString * str_legcolor=[NSString stringWithFormat:@"<b>Leg Color:</b> %@",legcolor];
@@ -308,31 +372,6 @@
 
         
         
-        NSString* set_price=@"";
-        NSString *price_null = [self textAtColumn:3 statement:stmt];
-        if ([price_null isEqualToString:@"null"]) {
-
-        }
-        else
-        {
-            set_price=[NSString stringWithFormat:@"Special: $ %.2f",price*(1-discount/100.0)];
-        }
-        NSString* get_price=@"";
-        {
-            
-//            NSNumber* price = [self get_model_default_price:appDelegate.contact_id product_id:nil item_id:@(item_id) db:db];
-            
-            NSString* price = [self get_portfolio_price :appDelegate.contact_id item_id:item_id   price:[params[@"regular_price"] intValue] db:db];
-            //                DebugLog(@"price time interval");
-            //                [self printTimeIntervalBetween:price_date and:[NSDate date]];
-            if(price==nil)
-                get_price=@"Price:No Price.";
-            else
-                get_price=[NSString stringWithFormat:@"Price: $ %@",price];
-        }
-        
-        
-
         
         
          NSMutableDictionary *item = [[NSMutableDictionary alloc] init];
@@ -10196,6 +10235,8 @@
     NSMutableDictionary *resultDictionary = [NSMutableDictionary dictionary];
     [resultDictionary setObject:@"Regular Mode" forKey:@"mode"];
     
+    NSMutableDictionary * values = params[@"replaceValue"];
+    
     NSString *tear_name = [self valueInParams:params key:@"pdfName"];
     
     NSString *tear_note = [self valueInParams:params key:@"pdfNote"];
@@ -10401,7 +10442,7 @@
         where = [NSString stringWithFormat:@"where (is_delete is null or is_delete = 0 ) and lower(create_user) like '%%%@%%' or lower(tear_note) like '%%%@%%'  or lower(tear_name) like '%%%@%%'",keyword.lowercaseString,keyword.lowercaseString,keyword.lowercaseString];
     }
     
-    NSString *sql = [NSString stringWithFormat:@"select tear_name,tear_note,createtime,create_user,pdf_path,tearsheets_id from offline_pdf %@ order by createtime desc limit %d offset %d;",where,limit,offset];
+    NSString *sql = [NSString stringWithFormat:@"select tear_name,tear_note,createtime,create_user,pdf_path,tearsheets_id,model_info,off_params from offline_pdf %@ order by createtime desc limit %d offset %d;",where,limit,offset];
     
     __block NSMutableDictionary *dic = [NSMutableDictionary dictionary];
     
@@ -10416,8 +10457,20 @@
         NSString *time = [self textAtColumn:2 statement:stmt];
         NSString *user = [self textAtColumn:3 statement:stmt];
         NSString *path = [self textAtColumn:4 statement:stmt];
+        
+        NSString *model_info = [self textAtColumn:6 statement:stmt];
+        NSString *off_params = [self textAtColumn:7 statement:stmt];
         path = [pdfFolder stringByAppendingPathComponent:path];
         
+        
+        BOOL bdir=NO;
+        NSFileManager* fileManager = [NSFileManager defaultManager];
+        if(!  [fileManager fileExistsAtPath:path isDirectory:&bdir]|| bdir)
+        {
+            //pdf文件不存在
+            path=nil;
+        }
+        
         time = [self changeDateTimeFormate:time];
         time = [time stringByAppendingString:@" PST"];
         
@@ -10425,15 +10478,17 @@
         int sheet_id = sqlite3_column_int(stmt, 5);
         
         
-        NSMutableDictionary *item = @{
-                                      @"tearsheetsId": @(sheet_id),
-                                      @"pdf_path": path,
-                                      @"create_time": time,
-                                      @"create_user": user,
-                                      @"tear_note": note,
-                                      @"tear_name": name,
-                                      @"isLocalFile":@"true"
-                                      }.mutableCopy;
+        NSMutableDictionary *item = [[NSMutableDictionary alloc] init];
+        item[@"tearsheetsId"]=@(sheet_id);
+        item[@"pdf_path"]=path;
+        item[@"create_time"]=time;
+        item[@"create_user"]=user;
+        item[@"tear_note"]=note;
+        item[@"tear_name"]=name;
+        item[@"isLocalFile"]=@"true";
+        item[@"model_info"]=model_info;
+        item[@"off_params"]=off_params;
+        
         
         [dic setObject:item forKey:[NSString stringWithFormat:@"item_%ld",*count]];
         [dic setValue:[NSNumber numberWithLong:++(*count)] forKey:@"count"];

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

@@ -499,6 +499,21 @@
         return;
     NSString* name=[self.content_data[indexPath.row] valueForKey:@"tear_name"];
     NSString* url= [self.content_data[indexPath.row] valueForKey:@"pdf_path"];
+    
+    if(url==nil)
+    {
+        
+        NSMutableDictionary* params = [RAUtils string2dict:[self.content_data[indexPath.row] valueForKey:@"off_params"]];
+        NSMutableDictionary* values = [RAUtils string2dict:[self.content_data[indexPath.row] valueForKey:@"model_info"]];
+        params[@"replaceValue"]=values;
+        params[@"tearsheetsId"]=[self.content_data[indexPath.row] valueForKey:@"tearsheetsId"];
+        NSString* createpdf = [iSalesNetwork create_portfolio:params];
+        if(createpdf!=nil)
+            url=createpdf;
+       // if()
+        
+    }
+
     NSString* isLocalFile= [self.content_data[indexPath.row] valueForKey:@"isLocalFile"];
     
     PDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"PDFViewController"];

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.h

@@ -112,6 +112,8 @@
 //+(NSDictionary*)category_addall2wish: (NSString*) category customid:(int) customid price_template:(int) price_template sort:(int) sort_by filter:(NSString*) filter keyword:(NSString*) keyword  offset:(long) offset limit:(long) limit alert:(NSString*)alert qty:(NSString*)qty available:(NSString*)available price:(NSString*)price bestseller:(NSString*)bestseller modelname:(NSString*) modelname modeldescrip:(NSString*)modeldescrip;
 //+(NSDictionary*)category_addall2portfolio: (NSString*) category customid:(int) customid price_template:(int) price_template sort:(int) sort_by filter:(NSString*) filter keyword:(NSString*) keyword  offset:(long) offset limit:(long) limit alert:(NSString*)alert qty:(NSString*)qty available:(NSString*)available price:(NSString*)price bestseller:(NSString*)bestseller modelname:(NSString*) modelname modeldescrip:(NSString*)modeldescrip;
 
++(NSString*) create_portfolio:(NSMutableDictionary*)params ;
+
 +(NSDictionary*)Search_addall:(long ) offset limit :(long)limit keywords :(NSString*) keywords matchfull:(bool)matchfull orderCode:(NSString*) orderCode  addTo:(NSString*) addTo;
 
 +(NSDictionary*)ItemSearch_addall:(long ) offset limit :(long)limit covertype:(NSString* ) covertype ctgid:(NSString*)ctgid modelname:(NSString*) modelname modeldescrip:(NSString*)modeldescrip alert:(NSString*)alert qty:(NSString*)qty available:(NSString*)available price:(NSString*)price bestseller:(NSString*)bestseller orderCode:(NSString*) orderCode addTo:(NSString*) addTo;

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -1471,6 +1471,25 @@ repeat:
     return jsobj;
     
 }
++(NSString*) create_portfolio:(NSMutableDictionary*)params
+{    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+        if(appDelegate.offline_mode)
+        {
+
+
+            NSData*json = [OLDataProvider offline_direct_save_TearSheet:params];
+            if(json==nil)
+                return nil;
+            NSError *error=nil;
+            NSDictionary *jsobj = [NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:&error];
+            
+            return jsobj[@"pdf_path"];
+        }
+        else
+        {
+            return nil;
+        }
+}
 +(NSDictionary*)direct_save_TearSheet:(NSMutableDictionary*)params//(NSString*) request_url name:(NSString*)name delete:(NSString* )ids note:(NSString* )saveNote modelIds:(NSDictionary *)modelIds
 {
     NSMutableDictionary* off_params = [params mutableCopy];;