更新

Kite-SDK/PSPrintSDK/Base.lproj/OLKiteStoryboard.storyboard

@@ -185,7 +185,7 @@
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RM8-Ff-8BD">
+                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RM8-Ff-8BD">
                                 <rect key="frame" x="16" y="30" width="23" height="23"/>
                                 <state key="normal" image="x-button"/>
                                 <connections>

Kite-SDK/PSPrintSDK/OLCheckoutViewController.m

@@ -44,6 +44,8 @@
 #import "OLImageDownloader.h"
 #import "OLUserSession.h"
 
+#import <UMCAnalytics/UMAnalytics/MobClick.h>
+
 NSString *const kOLNotificationUserSuppliedShippingDetails = @"co.oceanlabs.pssdk.kOLNotificationUserSuppliedShippingDetails";
 NSString *const kOLNotificationUserCompletedPayment = @"co.oceanlabs.pssdk.kOLNotificationUserCompletedPayment";
 NSString *const kOLNotificationPrintOrderSubmission = @"co.oceanlabs.pssdk.kOLNotificationPrintOrderSubmission";
@@ -301,7 +303,8 @@ - (void)checkAndSaveAddress{
         [defaults setObject:phone forKey:kKeyPhone];
         [defaults synchronize];
     }
-
+
+    [MobClick event:@"mb_user_info" attributes:@{@"email" : email, @"phone" : phone}];
     [[NSNotificationCenter defaultCenter] postNotificationName:kOLNotificationUserSuppliedShippingDetails object:self userInfo:@{kOLKeyUserInfoPrintOrder: self.printOrder}];
 }
 

Kite-SDK/PSPrintSDK/OLKiteUtils.m

@@ -40,6 +40,8 @@
 #import "OLFacebookSDKWrapper.h"
 #import "OLKiteViewController+Private.h"
 
+#import <FirebaseAuth/FIRUser.h>
+
 @import Contacts;
 @import PassKit;
 
@@ -157,8 +159,16 @@ + (BOOL)isPayPalAvailable{
 }
 
 + (void)checkoutViewControllerForPrintOrder:(OLPrintOrder *)printOrder handler:(void(^)(id vc))handler{
-    OLPaymentViewController *vc = [[OLPaymentViewController alloc] initWithPrintOrder:printOrder];
-    handler(vc);
+
+    if ([FIRAuth auth].currentUser.uid.length == 0) {
+        Class loginClass = NSClassFromString(@"MBLoginViewController");
+        id loginVC = [loginClass new];
+        UINavigationController *logNC = [[UINavigationController alloc] initWithRootViewController:loginVC];
+        [[UIApplication sharedApplication].keyWindow.rootViewController presentViewController:logNC animated:YES completion:NULL];        
+    }else{
+        OLPaymentViewController *vc = [[OLPaymentViewController alloc] initWithPrintOrder:printOrder];
+        handler(vc);
+    }
 }
 
 + (void)shippingControllerForPrintOrder:(OLPrintOrder *)printOrder handler:(void(^)(OLCheckoutViewController *vc))handler{

Kite-SDK/PSPrintSDK/OLPaymentViewController.m

@@ -1302,10 +1302,12 @@ - (IBAction)onButtonPayClicked:(UIButton *)sender {
             }
         }
         else if (selectedPaymentMethod == kOLPaymentMethodApplePay){
+
             [self payWithApplePay];
         }
         else if (selectedPaymentMethod == kOLPaymentMethodPayPal){
-            [self payWithPayPal];
+
+             [self payWithPayPal];
         }
     }];
 }

Kite-SDK/PSPrintSDK/OLReceiptViewController.m

@@ -48,6 +48,8 @@
 #import "OLKiteUtils.h"
 #import "OLUserSession.h"
 
+#import <UMCAnalytics/UMAnalytics/MobClick.h>
+
 static const NSUInteger kSectionOrderSummary = 0;
 static const NSUInteger kSectionOrderId = 1;
 static const NSUInteger kSectionErrorRetry = 2;
@@ -217,6 +219,9 @@ - (void)viewWillAppear:(BOOL)animated {
         self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
         self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
     }
+
+    [MobClick event:@"mb_order_success" attributes:@{@"email" : self.printOrder.email, @"orderid" : self.printOrder.receipt}];
+
 }
 
 - (void)viewDidAppear:(BOOL)animated {