161208

Change:
offline order list display order
change so submit reminder.

TEST VERSION 1.6.161209

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

@@ -122,11 +122,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/order/CreateOrderViewController.m"
-            timestampString = "502703473.92342"
+            timestampString = "502871919.155527"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "213"
-            endingLineNumber = "213"
+            startingLineNumber = "214"
+            endingLineNumber = "214"
             landmarkName = "-onCommitOrderClick:"
             landmarkType = "7">
          </BreakpointContent>
@@ -138,14 +138,78 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/order/CreateOrderViewController.m"
-            timestampString = "502703478.567593"
+            timestampString = "502871919.155527"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "211"
-            endingLineNumber = "211"
+            startingLineNumber = "212"
+            endingLineNumber = "212"
             landmarkName = "-onCommitOrderClick:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/CommonEditor/CommonEditorViewController.m"
+            timestampString = "502785434.13069"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "6073"
+            endingLineNumber = "6073"
+            landmarkName = "-fill_enum_subitem:subid:source:mapping:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "502792972.372137"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "3672"
+            endingLineNumber = "3672"
+            landmarkName = "+offline_createorder:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "502793078.250851"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "656"
+            endingLineNumber = "656"
+            landmarkName = "+prepare_salesorder_data:type:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/portfolio/TearSheetParamViewController.m"
+            timestampString = "502879320.195442"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "296"
+            endingLineNumber = "296"
+            landmarkName = "-onPreviewClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/order/CreateOrderViewController.m

@@ -180,7 +180,8 @@
         if(appDelegate.user_type == USER_ROLE_CUSTOMER) {
             
             NSString *specialInstuction = [Singleton sharedInstance].specialInstruction;
-            msg = [NSString stringWithFormat:@"Are you sure to submit order?\n\n1. Current Price Type is %@",[self currentPriceTypeName]];
+            NSString * deliverprice=[Singleton sharedInstance].deliveryString;
+            msg = [NSString stringWithFormat:@"Are you sure to submit order?\n\n1. Your price type is %@, Order will sent to NPD with this price.",deliverprice];
             if (specialInstuction.length) {
                 msg = [msg stringByAppendingFormat:@"\n2. Special Instruction: %@.",specialInstuction];
             }
@@ -2276,25 +2277,25 @@
 //    
 //    [self.navigationController popViewControllerAnimated:true];
 //}
-
-- (NSString *)currentPriceTypeName {
-    NSInteger priceType = [Singleton sharedInstance].npd_shop_price_type;
-        
-    NSString* pricename = nil;
-    switch (priceType) {
-        case 0:
-            pricename=[Singleton sharedInstance].deliveryString;
-            break;
-        case 1:
-            pricename=flat_price;
-            break;
-        case 2:
-            pricename=given_price;
-            break;
-        default:
-            break;
-    }
-    return pricename;
-}
+//
+//- (NSString *)currentPriceTypeName {
+//    NSInteger priceType = [Singleton sharedInstance].npd_shop_price_type;
+//        
+//    NSString* pricename = nil;
+//    switch (priceType) {
+//        case 0:
+//            pricename=[Singleton sharedInstance].deliveryString;
+//            break;
+//        case 1:
+//            pricename=flat_price;
+//            break;
+//        case 2:
+//            pricename=given_price;
+//            break;
+//        default:
+//            break;
+//    }
+//    return pricename;
+//}
 
 @end

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -10,7 +10,7 @@
 #define RedAnt_ERP_Mobile_config_h
 #define BUILD_NPD
 
-#define test_server
+//#define test_server
 #define exception_switch 1
 
 //#define ab_lager @"Delivery price"
@@ -20,7 +20,7 @@
 #import "Singleton.h"
 
 
-#define PDF_DEBUG true
+#define PDF_DEBUG false
 
 //#define ENCRYPT_OFF
  

RedAnt ERP Mobile/iSales-NPD/iSales-NPD-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>161121</string>
+	<string>161209</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>