added deliver price previous lbl

bentocorp · Feb 19, 2016 · fb4761c · fb4761c
1 parent 9db9190
commit fb4761c
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 62 deletions.
diff --git a/Bento.xcworkspace/xcuserdata/JosephLauSF.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Bento.xcworkspace/xcuserdata/JosephLauSF.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -58,11 +58,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Bento/ViewController/SignIn/SignInViewController.m"
-            timestampString = "476308809.21742"
+            timestampString = "477610224.532232"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "507"
-            endingLineNumber = "507"
+            startingLineNumber = "514"
+            endingLineNumber = "514"
             landmarkName = "-reqGraphAPI:"
             landmarkType = "5">
          </BreakpointContent>
@@ -74,11 +74,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Bento/ViewController/SignIn/SignInViewController.m"
-            timestampString = "476308809.21742"
+            timestampString = "477610224.532232"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "466"
-            endingLineNumber = "466"
+            startingLineNumber = "473"
+            endingLineNumber = "473"
             landmarkName = "-reqFacebookUserInfo"
             landmarkType = "5">
          </BreakpointContent>
@@ -90,11 +90,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Bento/ViewController/SignIn/SignInViewController.m"
-            timestampString = "476308809.21742"
+            timestampString = "477610224.532232"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "458"
-            endingLineNumber = "458"
+            startingLineNumber = "465"
+            endingLineNumber = "465"
             landmarkName = "-reqFacebookUserInfo"
             landmarkType = "5">
          </BreakpointContent>
@@ -106,45 +106,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Bento/ViewController/SignIn/SignInViewController.m"
-            timestampString = "476308809.21742"
+            timestampString = "477610224.532232"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "446"
-            endingLineNumber = "446"
+            startingLineNumber = "453"
+            endingLineNumber = "453"
             landmarkName = "-reqFacebookUserInfo"
             landmarkType = "5">
-            <Locations>
-               <Location
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[SignInViewController reqFacebookUserInfo]"
-                  moduleName = "Bento Dev"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/JosephLauSF/_github/Bento/Bento/ViewController/SignIn/SignInViewController.m"
-                  timestampString = "477607579.690056"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "446"
-                  endingLineNumber = "446"
-                  offsetFromSymbolStart = "354">
-               </Location>
-               <Location
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__43-[SignInViewController reqFacebookUserInfo]_block_invoke"
-                  moduleName = "Bento Dev"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/JosephLauSF/_github/Bento/Bento/ViewController/SignIn/SignInViewController.m"
-                  timestampString = "477607579.690203"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "446"
-                  endingLineNumber = "446"
-                  offsetFromSymbolStart = "70">
-               </Location>
-            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -154,11 +122,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Bento/ViewController/SignIn/SignInViewController.m"
-            timestampString = "476308809.21742"
+            timestampString = "477610224.532232"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "451"
-            endingLineNumber = "451"
+            startingLineNumber = "458"
+            endingLineNumber = "458"
             landmarkName = "-reqFacebookUserInfo"
             landmarkType = "5">
          </BreakpointContent>
@@ -322,11 +290,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Bento/ViewController/SignIn/SignInViewController.m"
-            timestampString = "476308809.21742"
+            timestampString = "477610224.532232"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "573"
-            endingLineNumber = "573"
+            startingLineNumber = "580"
+            endingLineNumber = "580"
             landmarkName = "-fbLoginAPICallToBackend:dictRequest:"
             landmarkType = "5">
          </BreakpointContent>
@@ -465,13 +433,45 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "Bento/ViewController/FirstViewController.m"
-            timestampString = "477607578.460688"
+            filePath = "Bento/ViewController/SignedInSettingsViewController.m"
+            timestampString = "477611110.780933"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "575"
+            endingLineNumber = "575"
+            landmarkName = "-processLogout"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Bento/ViewController/SignedInSettingsViewController.m"
+            timestampString = "477611146.82268"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "596"
+            endingLineNumber = "596"
+            landmarkName = "-alertView:clickedButtonAtIndex:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Bento/ViewController/Order/CompleteOrderViewController.m"
+            timestampString = "477612402.140892"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "313"
-            endingLineNumber = "313"
-            landmarkName = "-processAutoLogin"
+            startingLineNumber = "159"
+            endingLineNumber = "159"
+            landmarkName = "-viewDidLoad"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>

diff --git a/Bento/Base.lproj/Main.storyboard b/Bento/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="bfp-2n-wGh">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15E39d" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="bfp-2n-wGh">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
     </dependencies>
     <customFonts key="customFonts">
         <mutableArray key="OpenSans-Bold.ttf">
@@ -116,6 +116,7 @@
             <string>OpenSans-Semibold</string>
             <string>OpenSans-Semibold</string>
             <string>OpenSans-Semibold</string>
+            <string>OpenSans-Semibold</string>
         </mutableArray>
     </customFonts>
     <scenes>
@@ -1429,12 +1430,19 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$4" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="V4F-Un-VVC">
-                                        <rect key="frame" x="205" y="7" width="100" height="21"/>
+                                        <rect key="frame" x="241" y="7" width="64" height="21"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" name="OpenSans" family="Open Sans" pointSize="12"/>
                                         <color key="textColor" red="0.4039215686" green="0.44705882349999998" blue="0.50196078430000002" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$2.25" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="apF-d2-fYi">
+                                        <rect key="frame" x="183" y="7" width="60" height="21"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" name="OpenSans-Semibold" family="Open Sans" pointSize="12"/>
+                                        <color key="textColor" red="0.9155273438" green="0.49854745340000001" blue="0.34104120989999998" alpha="1" colorSpace="calibratedRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             </view>
@@ -1574,6 +1582,7 @@
                         <outlet property="ivCardType" destination="cls-zz-h40" id="irU-AI-WhK"/>
                         <outlet property="lblAddress" destination="LX8-ou-bJ7" id="xdF-aw-kJV"/>
                         <outlet property="lblDeliveryPrice" destination="jf1-R6-9fd" id="rrc-dl-lQq"/>
+                        <outlet property="lblDeliveryPricePrevious" destination="apF-d2-fYi" id="txb-DG-Ipi"/>
                         <outlet property="lblDeliveryTip" destination="kjF-xR-Bb6" id="uV0-EJ-F3a"/>
                         <outlet property="lblPaymentMethod" destination="5KH-qE-afz" id="cqo-2K-2Cv"/>
                         <outlet property="lblPromoDiscount" destination="AEx-9y-g8p" id="DQ4-qB-Vih"/>

diff --git a/Bento/ViewController/FirstViewController.m b/Bento/ViewController/FirstViewController.m
@@ -293,16 +293,14 @@ - (void)afterViewWillAppear {
 
 - (void)processAutoLogin
 {
-//    NSString *strAPIName = [[NSUserDefaults standardUserDefaults] objectForKey:@"apiName"];
-
-    NSString *strRequest = [NSString stringWithFormat:@"%@/user/login", SERVER_URL];
+    NSString *strAPIName = [[NSUserDefaults standardUserDefaults] objectForKey:@"apiName"];
     NSDictionary *dicRequest = [[NSUserDefaults standardUserDefaults] objectForKey:@"loginRequest"];
 
     NSLog(@"auto login dicRequest - %@", dicRequest);
 
     WebManager *webManager = [[WebManager alloc] init];
 
-    [webManager AsyncProcess:strRequest method:POST parameters:dicRequest success:^(MKNetworkOperation *networkOperation)
+    [webManager AsyncProcess:strAPIName method:POST parameters:dicRequest success:^(MKNetworkOperation *networkOperation)
     {
         [self.activityIndicator stopAnimating];
 

diff --git a/Bento/ViewController/Order/CompleteOrderViewController.m b/Bento/ViewController/Order/CompleteOrderViewController.m
@@ -75,6 +75,7 @@ @interface CompleteOrderViewController () <UIActionSheetDelegate, PKPaymentAutho
 
 @property (nonatomic, weak) IBOutlet UILabel *lblPromoDiscount;
 @property (nonatomic, weak) IBOutlet UILabel *lblTax;
+@property (weak, nonatomic) IBOutlet UILabel *lblDeliveryPricePrevious;
 @property (weak, nonatomic) IBOutlet UILabel *lblDeliveryPrice;
 @property (nonatomic, weak) IBOutlet UILabel *lblDeliveryTip;
 @property (nonatomic, weak) IBOutlet UILabel *lblTotal;
@@ -153,6 +154,9 @@ - (BOOL)applePayEnabled
 - (void)viewDidLoad {
     [super viewDidLoad];
 
+    NSDictionary *userInfo = [[DataManager shareDataManager] getUserInfo];
+    NSLog(@"user info - %i", [userInfo[@"has_oa_subscription"] boolValue]);
+
     allowCommitOnKeep = YES;
 
     // Mixpanel track for Placed An Order
@@ -174,6 +178,7 @@ - (void)viewDidLoad {
     _isEditingAddons = NO;
 
     self.lblTotalPrevious.hidden = YES;
+    self.lblDeliveryPricePrevious.hidden = YES;
 
     NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
     _strPromoCode = [userDefaults objectForKey:KEY_PROMO_CODE];