فهرست منبع

增加文件placeOrderTemplate.json,实现方法sign order

Pen Li 9 سال پیش
والد
کامیت
421183e480

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 52 - 14
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -1413,18 +1413,6 @@
     
 }
 
-#warning 明天继续....
-
-+(NSData*) offline_signorder :(NSMutableDictionary *) params
-{
-    //参考 offline_saveBusinesscard
-    NSLog(@"sign order params: %@",params);
-//    orderCode = MOB1608240002;
-//    picpath = "16360511-BA55-4D66-9112-EF9DEA4A14F0.png";
-    
-    
-    return nil;
-}
 +(NSData*) offline_add2cart :(NSMutableDictionary *) params;
 {
     NSMutableDictionary* ret = [[NSMutableDictionary alloc] init];
@@ -5791,12 +5779,34 @@
     return [RAUtils dict2data:dic];
 
 }
+
+#pragma mark place order
+
 +(NSData*) offline_placeorder :(NSMutableDictionary *) params
 {
-    return nil;
+    // params
+    NSString *contactId = [self valueInParams:params key:@"contactId"];
+    NSString *orderCode = [self valueInParams:params key:@"orderCode"];
+    
+    //  0 Order Type    1 Shipping Method       2 Payment Information
+    NSMutableDictionary *ret = [self dictionaryFileName:@"placeOrderTemplate.json"];
+    
+    //    3 Customer
+    NSDictionary *customerInfo = [self offline_contactinfo:[@{@"contactId":contactId} mutableCopy]];
+    
+    //    4 Ship To
+    //    5 Ship From
+    //    6 Freight Bill To
+    //    7 Merchandise Bill To
+    //    8 Return To
+    //    9 Model Information
+    //    10 Remarks Content
+    //    11 Order Total
+    //    12 Signature
+    
+    return [RAUtils dict2data:ret];
 }
 
-
 #pragma mark cancel order
 
 
@@ -5817,4 +5827,32 @@
     
 }
 
+#pragma mark sign order
+
++(NSData*) offline_signorder :(NSMutableDictionary *) params
+{
+    //参考 offline_saveBusinesscard
+    NSLog(@"sign order params: %@",params);
+    //    orderCode = MOB1608240002;
+    //    picpath = "16360511-BA55-4D66-9112-EF9DEA4A14F0.png";
+    
+    NSString *orderCode = [self valueInParams:params key:@"orderCode"];
+    orderCode = [self translateSingleQuote:orderCode];
+    NSString *picPath = [self valueInParams:params key:@"picpath"];
+    picPath = [self translateSingleQuote:picPath];
+    
+    NSString *sql = [NSString stringWithFormat:@"update offline_order set sign_picpath = '%@' where so_id = '%@';",picPath,orderCode];
+    
+    
+    int ret = [iSalesDB execSql:sql];
+    
+    NSMutableDictionary *dic = [NSMutableDictionary dictionary];
+    [dic setValue:[NSNumber numberWithInteger:ret] forKey:@"result"];
+    [dic setValue:@"Regular Mode" forKey:@"mode"];
+    [dic setValue:@"160409" forKey:@"min_ver"];
+    
+    return [RAUtils dict2data:dic];
+
+}
+
 @end

+ 4 - 0
RedAnt ERP Mobile/iSales-NPD.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		423A4ADC1D503A53005ECE4A /* createContact.json in Resources */ = {isa = PBXBuildFile; fileRef = 423A4ADB1D503A53005ECE4A /* createContact.json */; };
 		42969C021D52F31C00FF190A /* editContact.json in Resources */ = {isa = PBXBuildFile; fileRef = 42969C011D52F31C00FF190A /* editContact.json */; };
+		42A225331D6E7D1D00235B62 /* placeOrderTemplate.json in Resources */ = {isa = PBXBuildFile; fileRef = 42A225321D6E7D1D00235B62 /* placeOrderTemplate.json */; };
 		42A51BF41D62F60300F13667 /* more_info.html in Resources */ = {isa = PBXBuildFile; fileRef = 42A51BF31D62F60300F13667 /* more_info.html */; };
 		42A51BF61D62F9AB00F13667 /* orderDetail.json in Resources */ = {isa = PBXBuildFile; fileRef = 42A51BF51D62F9AB00F13667 /* orderDetail.json */; };
 		42B3C9BB1D642C880053985C /* order_info.html in Resources */ = {isa = PBXBuildFile; fileRef = 42B3C9BA1D642C880053985C /* order_info.html */; };
@@ -199,6 +200,7 @@
 /* Begin PBXFileReference section */
 		423A4ADB1D503A53005ECE4A /* createContact.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = createContact.json; sourceTree = "<group>"; };
 		42969C011D52F31C00FF190A /* editContact.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = editContact.json; sourceTree = "<group>"; };
+		42A225321D6E7D1D00235B62 /* placeOrderTemplate.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = placeOrderTemplate.json; sourceTree = "<group>"; };
 		42A51BF31D62F60300F13667 /* more_info.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = more_info.html; sourceTree = "<group>"; };
 		42A51BF51D62F9AB00F13667 /* orderDetail.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = orderDetail.json; sourceTree = "<group>"; };
 		42B3C9BA1D642C880053985C /* order_info.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = order_info.html; sourceTree = "<group>"; };
@@ -821,6 +823,7 @@
 				42A51BF51D62F9AB00F13667 /* orderDetail.json */,
 				42A51BF31D62F60300F13667 /* more_info.html */,
 				42B3C9BA1D642C880053985C /* order_info.html */,
+				42A225321D6E7D1D00235B62 /* placeOrderTemplate.json */,
 			);
 			name = utils;
 			sourceTree = "<group>";
@@ -1285,6 +1288,7 @@
 				7162A55F1C58724700AB630E /* customer_info_template.json in Resources */,
 				71D46D111CE1D9EF00A081AC /* OLM.storyboard in Resources */,
 				42B3C9BB1D642C880053985C /* order_info.html in Resources */,
+				42A225331D6E7D1D00235B62 /* placeOrderTemplate.json in Resources */,
 				7141DD3D1C5726B700F7DF59 /* softScanBeep.wav in Resources */,
 				7141DD341C57269B00F7DF59 /* include in Resources */,
 				7141DD601C5747CE00F7DF59 /* LICENSE in Resources */,

+ 554 - 0
RedAnt ERP Mobile/iSales-NPD/placeOrderTemplate.json

@@ -0,0 +1,554 @@
+{
+  "can_see_price" : true,
+  "has_reItem" : false,
+  "min_ver" : "160409",
+  "mode" : "Regular Mode",
+  "result" : 2,
+  "section_0" : {
+    "count" : 1,
+    "item_0" : {
+      "aname" : "Submit Order As",
+      "cadedate" : {
+        "count" : 2,
+        "val_0" : {
+          "check" : 0,
+          "value" : "Sales Order",
+          "value_id" : 11
+        },
+        "val_1" : {
+          "check" : 0,
+          "value" : "Quote",
+          "value_id" : 10
+        }
+      },
+      "control" : "enum",
+      "name" : "erpOrderStatus",
+      "required" : "true",
+      "single_select" : "true"
+    },
+    "title" : "Order Type"
+  },
+  "section_1" : {
+    "count" : 1,
+    "item_0" : {
+      "aname" : "Shipping",
+      "cadedate" : {
+        "count" : 2,
+        "val_0" : {
+          "check" : 0,
+          "sub_item" : {
+            "count" : 1,
+            "item_0" : {
+              "aname" : "Option",
+              "cadedate" : {
+                "count" : 2,
+                "val_0" : {
+                  "check" : 0,
+                  "refresh" : 0,
+                  "value" : "PERSONAL PICK UP",
+                  "value_id" : "PERSONAL PICK UP"
+                },
+                "val_1" : {
+                  "check" : 0,
+                  "refresh" : 0,
+                  "sub_item" : {
+                    "count" : 1,
+                    "item_0" : {
+                      "aname" : "BOL",
+                      "control" : "edit",
+                      "keyboard" : "text",
+                      "name" : "logist_note_text",
+                      "refresh" : 0,
+                      "required" : "false",
+                      "value" : ""
+                    }
+                  },
+                  "value" : "USE MY CARRIER",
+                  "value_id" : "USE MY CARRIER"
+                }
+              },
+              "control" : "enum",
+              "name" : "logistic_note",
+              "required" : "true",
+              "single_select" : "true"
+            }
+          },
+          "value" : "WILL CALL(requires 24 hours advance notice)",
+          "value_id" : "WILL CALL"
+        },
+        "val_1" : {
+          "check" : 0,
+          "sub_item" : {
+            "count" : 1,
+            "item_0" : {
+              "aname" : "Do you have Loading Dock Available ? Slide to green for YES",
+              "control" : "switch",
+              "name" : "lift_gate",
+              "refresh" : 1,
+              "required" : "true",
+              "value" : "false"
+            }
+          },
+          "value" : "COMMON CARRIER",
+          "value_id" : "COMMON CARRIER"
+        }
+      },
+      "control" : "enum",
+      "name" : "logist",
+      "refresh" : 1,
+      "single_select" : "true"
+    },
+    "title" : "Shipping Method"
+  },
+  "section_2" : {
+    "count" : 1,
+    "item_0" : {
+      "aname" : "Payment",
+      "cadedate" : {
+        "count" : 6,
+        "val_0" : {
+          "check" : 0,
+          "value" : "Check",
+          "value_id" : "Check"
+        },
+        "val_1" : {
+          "check" : 0,
+          "value" : "Cash",
+          "value_id" : "Cash"
+        },
+        "val_2" : {
+          "check" : 0,
+          "value" : "NET 30",
+          "value_id" : "NET 30"
+        },
+        "val_3" : {
+          "check" : 0,
+          "value" : "Wire Transfer",
+          "value_id" : "Wire Transfer"
+        },
+        "val_4" : {
+          "check" : 0,
+          "sub_item" : {
+            "count" : 3,
+            "item_0" : {
+              "aname" : "choose",
+              "control" : "multi_action",
+              "count" : 1,
+              "item_0" : {
+                "aname" : "Same as customer",
+                "key_map" : {
+                  "credit_card_address1" : "customer_address1",
+                  "credit_card_address2" : "customer_address2",
+                  "credit_card_city" : "customer_city",
+                  "credit_card_first_name" : "customer_first_name",
+                  "credit_card_last_name" : "customer_last_name",
+                  "credit_card_state" : "customer_state",
+                  "credit_card_zipcode" : "customer_zipcode"
+                },
+                "type" : "pull"
+              }
+            },
+            "item_1" : {
+              "aname" : "",
+              "color" : "red",
+              "control" : "text",
+              "name" : "",
+              "value" : "USA Credit cards only"
+            },
+            "item_2" : {
+              "aname" : "Fill",
+              "cadedate" : {
+                "count" : 2,
+                "val_0" : {
+                  "check" : 1,
+                  "sub_item" : {
+                    "count" : 11,
+                    "item_0" : {
+                      "aname" : "Type",
+                      "cadedate" : {
+                        "count" : 2,
+                        "val_0" : {
+                          "check" : 1,
+                          "value" : "VISA",
+                          "value_id" : 0
+                        },
+                        "val_1" : {
+                          "check" : 0,
+                          "value" : "MASTER CARD",
+                          "value_id" : 1
+                        }
+                      },
+                      "control" : "enum",
+                      "name" : "credit_card_type",
+                      "required" : "true",
+                      "single_select" : "true"
+                    },
+                    "item_1" : {
+                      "aname" : "Number",
+                      "control" : "edit",
+                      "keyboard" : "int",
+                      "length" : "16",
+                      "name" : "credit_card_number",
+                      "required" : "true",
+                      "value" : ""
+                    },
+                    "item_10" : {
+                      "aname" : "State",
+                      "cadedate" : {
+                        "count" : 49,
+                        "val_0" : {
+                          "check" : 0,
+                          "value" : "AL-ALABAMA",
+                          "value_id" : "AL"
+                        },
+                        "val_1" : {
+                          "check" : 0,
+                          "value" : "AR-ARKANSAS",
+                          "value_id" : "AR"
+                        },
+                        "val_10" : {
+                          "check" : 0,
+                          "value" : "IA-IOWA",
+                          "value_id" : "IA"
+                        },
+                        "val_11" : {
+                          "check" : 0,
+                          "value" : "ID-IDAHO",
+                          "value_id" : "ID"
+                        },
+                        "val_12" : {
+                          "check" : 0,
+                          "value" : "IL-ILLINOIS",
+                          "value_id" : "IL"
+                        },
+                        "val_13" : {
+                          "check" : 0,
+                          "value" : "IN-INDIANA",
+                          "value_id" : "IN"
+                        },
+                        "val_14" : {
+                          "check" : 0,
+                          "value" : "KS-KANSAS",
+                          "value_id" : "KS"
+                        },
+                        "val_15" : {
+                          "check" : 0,
+                          "value" : "KY-KENTUCKY",
+                          "value_id" : "KY"
+                        },
+                        "val_16" : {
+                          "check" : 0,
+                          "value" : "LA-LOUISIANA",
+                          "value_id" : "LA"
+                        },
+                        "val_17" : {
+                          "check" : 0,
+                          "value" : "MA-MASSACHUSETTS",
+                          "value_id" : "MA"
+                        },
+                        "val_18" : {
+                          "check" : 0,
+                          "value" : "MD-MARYLAND",
+                          "value_id" : "MD"
+                        },
+                        "val_19" : {
+                          "check" : 0,
+                          "value" : "ME-MAINE",
+                          "value_id" : "ME"
+                        },
+                        "val_2" : {
+                          "check" : 0,
+                          "value" : "AZ-ARIZONA",
+                          "value_id" : "AZ"
+                        },
+                        "val_20" : {
+                          "check" : 0,
+                          "value" : "MI-MICHIGAN",
+                          "value_id" : "MI"
+                        },
+                        "val_21" : {
+                          "check" : 0,
+                          "value" : "MN-MINNESOTA",
+                          "value_id" : "MN"
+                        },
+                        "val_22" : {
+                          "check" : 0,
+                          "value" : "MO-MISSOURI",
+                          "value_id" : "MO"
+                        },
+                        "val_23" : {
+                          "check" : 0,
+                          "value" : "MS-MISSISSIPPI",
+                          "value_id" : "MS"
+                        },
+                        "val_24" : {
+                          "check" : 0,
+                          "value" : "MT-MONTANA",
+                          "value_id" : "MT"
+                        },
+                        "val_25" : {
+                          "check" : 0,
+                          "value" : "NC-NORTH CAROLINA",
+                          "value_id" : "NC"
+                        },
+                        "val_26" : {
+                          "check" : 0,
+                          "value" : "ND-NORTH DAKOTA",
+                          "value_id" : "ND"
+                        },
+                        "val_27" : {
+                          "check" : 0,
+                          "value" : "NE-NEBRASKA",
+                          "value_id" : "NE"
+                        },
+                        "val_28" : {
+                          "check" : 0,
+                          "value" : "NH-NEW HAMPSHIRE",
+                          "value_id" : "NH"
+                        },
+                        "val_29" : {
+                          "check" : 0,
+                          "value" : "NJ-NEW JERSEY",
+                          "value_id" : "NJ"
+                        },
+                        "val_3" : {
+                          "check" : 0,
+                          "value" : "CA-CALIFORNIA",
+                          "value_id" : "CA"
+                        },
+                        "val_30" : {
+                          "check" : 0,
+                          "value" : "NM-NEW MEXICO",
+                          "value_id" : "NM"
+                        },
+                        "val_31" : {
+                          "check" : 0,
+                          "value" : "NV-NEVADA",
+                          "value_id" : "NV"
+                        },
+                        "val_32" : {
+                          "check" : 0,
+                          "value" : "NY-NEW YORK",
+                          "value_id" : "NY"
+                        },
+                        "val_33" : {
+                          "check" : 0,
+                          "value" : "OH-OHIO",
+                          "value_id" : "OH"
+                        },
+                        "val_34" : {
+                          "check" : 0,
+                          "value" : "OK-OKLAHOMA",
+                          "value_id" : "OK"
+                        },
+                        "val_35" : {
+                          "check" : 0,
+                          "value" : "OR-OREGON",
+                          "value_id" : "OR"
+                        },
+                        "val_36" : {
+                          "check" : 0,
+                          "value" : "PA-PENNSYLVANIA",
+                          "value_id" : "PA"
+                        },
+                        "val_37" : {
+                          "check" : 0,
+                          "value" : "RI-RHODE ISLAND",
+                          "value_id" : "RI"
+                        },
+                        "val_38" : {
+                          "check" : 0,
+                          "value" : "SC-SOUTH CAROLINA",
+                          "value_id" : "SC"
+                        },
+                        "val_39" : {
+                          "check" : 0,
+                          "value" : "SD-SOUTH DAKOTA",
+                          "value_id" : "SD"
+                        },
+                        "val_4" : {
+                          "check" : 0,
+                          "value" : "CO-COLORADO",
+                          "value_id" : "CO"
+                        },
+                        "val_40" : {
+                          "check" : 0,
+                          "value" : "TN-TENNESSEE",
+                          "value_id" : "TN"
+                        },
+                        "val_41" : {
+                          "check" : 0,
+                          "value" : "TX-TEXAS",
+                          "value_id" : "TX"
+                        },
+                        "val_42" : {
+                          "check" : 0,
+                          "value" : "UT-UTAH",
+                          "value_id" : "UT"
+                        },
+                        "val_43" : {
+                          "check" : 0,
+                          "value" : "VA-VIRGINIA",
+                          "value_id" : "VA"
+                        },
+                        "val_44" : {
+                          "check" : 0,
+                          "value" : "VT-VERMONT",
+                          "value_id" : "VT"
+                        },
+                        "val_45" : {
+                          "check" : 0,
+                          "value" : "WA-WASHINGTON",
+                          "value_id" : "WA"
+                        },
+                        "val_46" : {
+                          "check" : 0,
+                          "value" : "WI-WISCONSIN",
+                          "value_id" : "WI"
+                        },
+                        "val_47" : {
+                          "check" : 0,
+                          "value" : "WV-WEST VIRGINIA",
+                          "value_id" : "WV"
+                        },
+                        "val_48" : {
+                          "check" : 0,
+                          "value" : "WY-WYOMING",
+                          "value_id" : "WY"
+                        },
+                        "val_5" : {
+                          "check" : 0,
+                          "value" : "CT-CONNECTICUT",
+                          "value_id" : "CT"
+                        },
+                        "val_6" : {
+                          "check" : 0,
+                          "value" : "DC-DISTRICT OF COLUMBIA",
+                          "value_id" : "DC"
+                        },
+                        "val_7" : {
+                          "check" : 0,
+                          "value" : "DE-DELAWARE",
+                          "value_id" : "DE"
+                        },
+                        "val_8" : {
+                          "check" : 0,
+                          "value" : "FL-FLORIDA",
+                          "value_id" : "FL"
+                        },
+                        "val_9" : {
+                          "check" : 0,
+                          "value" : "GA-GEORGIA",
+                          "value_id" : "GA"
+                        }
+                      },
+                      "control" : "enum",
+                      "enum" : "true",
+                      "name" : "credit_card_state",
+                      "required" : "true",
+                      "single_select" : "true"
+                    },
+                    "item_2" : {
+                      "aname" : "Expiration Date",
+                      "control" : "monthpicker",
+                      "name" : "credit_card_expiration",
+                      "required" : "true",
+                      "type" : "date",
+                      "value" : ""
+                    },
+                    "item_3" : {
+                      "aname" : "Security Code",
+                      "control" : "edit",
+                      "keyboard" : "int",
+                      "length" : "3",
+                      "name" : "credit_card_security_code",
+                      "required" : "true",
+                      "value" : ""
+                    },
+                    "item_4" : {
+                      "aname" : "First Name",
+                      "control" : "edit",
+                      "keyboard" : "text",
+                      "name" : "credit_card_first_name",
+                      "required" : "true",
+                      "value" : ""
+                    },
+                    "item_5" : {
+                      "aname" : "Last Name",
+                      "control" : "edit",
+                      "keyboard" : "text",
+                      "name" : "credit_card_last_name",
+                      "required" : "true",
+                      "value" : ""
+                    },
+                    "item_6" : {
+                      "aname" : "Address 1",
+                      "control" : "edit",
+                      "keyboard" : "text",
+                      "name" : "credit_card_address1",
+                      "required" : "true",
+                      "value" : ""
+                    },
+                    "item_7" : {
+                      "aname" : "Address 2",
+                      "control" : "edit",
+                      "keyboard" : "text",
+                      "name" : "credit_card_address2",
+                      "value" : ""
+                    },
+                    "item_8" : {
+                      "aname" : "zip code",
+                      "control" : "edit",
+                      "keyboard" : "text",
+                      "name" : "credit_card_zipcode",
+                      "required" : "true",
+                      "value" : ""
+                    },
+                    "item_9" : {
+                      "aname" : "City",
+                      "control" : "edit",
+                      "keyboard" : "text",
+                      "name" : "credit_card_city",
+                      "required" : "true",
+                      "value" : ""
+                    }
+                  },
+                  "value" : "Fill Now",
+                  "value_id" : ""
+                },
+                "val_1" : {
+                  "check" : 0,
+                  "value" : "Fill Later",
+                  "value_id" : ""
+                }
+              },
+              "control" : "enum",
+              "name" : "",
+              "single_select" : "true"
+            }
+          },
+          "value" : "Credit Card",
+          "value_id" : "Credit Card"
+        },
+        "val_5" : {
+          "check" : 0,
+          "value" : "FOLLOW EXISTING",
+          "value_id" : "FOLLOW EXISTING"
+        }
+      },
+      "control" : "enum",
+      "name" : "paymentType",
+      "single_select" : "true"
+    },
+    "title" : "Payment Information"
+  },
+  "section_count" : 13,
+  "title" : "Edit Order",
+  "up_params" : {
+    "count" : 4,
+    "val_0" : "logist",
+    "val_1" : "receive_cid",
+    "val_2" : "lift_gate",
+    "val_3" : "customer_cid"
+  }
+}