Explorar el Código

1.修改Homer Web地址。
2.修改Order List Segment Title。

Pen Li hace 8 años
padre
commit
2eae23dd8e

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


+ 0 - 18
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,22 +2,4 @@
 <Bucket
    type = "0"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/cart/CartViewController.m"
-            timestampString = "529490015.61261"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1914"
-            endingLineNumber = "1914"
-            landmarkName = "-tableView:editActionsForRowAtIndexPath:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>

+ 1 - 1
RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -2247,7 +2247,7 @@
     else if([title isEqualToString:@"HOMER Website"])
     {
         
-        NSString* url = @"https://homelegance.com/";
+        NSString* url = COMPANY_WEB;
         
         NSString* title = @"HOMER";
 

+ 5 - 0
RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -382,6 +382,11 @@
         self.table_order.frame = frame;
     }
     
+    // 修复Homer显示NPD
+    if (self.orderTypeSegmentControl.numberOfSegments > 1) {
+        [self.orderTypeSegmentControl setTitle:[NSString stringWithFormat:@"Purchase Order to %@",COMPANY_SHORT_NAME] forSegmentAtIndex:1];
+    }
+    
     // 显示Sales Order与否
     if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
         if ([Singleton sharedInstance].global_lock || ![Singleton sharedInstance].customer_can_see_sales_Order) { // 是否解锁,是否有查看Sales Order权限

+ 3 - 3
RedAnt ERP Mobile/iSales-HOMER/config.h

@@ -13,14 +13,14 @@
 #define  APP_NAME @"HOMER Mobile"
 #define  COMPANY_SHORT_NAME @"HOMER"
 #define  COMPANY_NAME @"HOMELEGANCE LA, INC."
-#define  COMPANY_INFO @"Sales: homerica@homelegance.com\nPhone: 888/458-1688"
-#define  COMPANY_WEB @"homelegance.com"
+#define  COMPANY_INFO @"Sales: homerica@homelegance.com\nPhone: 562-903-5668"
+#define  COMPANY_WEB @"https://shopla.homelegance.com"
 #define  COMPANY_FULL_NAME @"HOMELEGANCE LA, INC."
 
 #define MPACK
 
 # ifdef DEBUG
-#define test_server
+//#define test_server
 # endif
 
 #define exception_switch 1