Prechádzať zdrojové kódy

Merge branch 'master' of http://gogs.hnwmzp.cn/nzk1/Asteria-APP

Abel 1 rok pred
rodič
commit
1a5c841cba
38 zmenil súbory, kde vykonal 36594 pridanie a 27784 odobranie
  1. 26 2
      Asteria.xcodeproj/project.pbxproj
  2. 22 1
      Asteria/AppDelegate.m
  3. 24 65
      Asteria/Fuction/Cart/Cart_CheckoutC.m
  4. 4 3
      Asteria/Fuction/Cart/Cell/MyCartGrandTotalCell.m
  5. 14 0
      Asteria/Fuction/Cart/Checkout/ASCheckoutPointApplyCell.m
  6. 2 1
      Asteria/Fuction/Cart/Checkout/CartCheckTableV.m
  7. 9 7
      Asteria/Fuction/Cart/PayManager/ASCheckoutPayManager.h
  8. 187 58
      Asteria/Fuction/Cart/PayManager/ASCheckoutPayManager.m
  9. 7 0
      Asteria/Fuction/Cart/PayManager/Asteria-Bridging-Header.h
  10. 187 0
      Asteria/Fuction/Cart/PayManager/ToolStripePayment.swift
  11. 6 1
      Asteria/Fuction/Cart/VM/CartVM.h
  12. 22 0
      Asteria/Fuction/Goods/V/ASGoodsCouponCell.m
  13. 39 4
      Asteria/Fuction/Goods/V/ASGoodsDetailsTableView.m
  14. 0 7
      Asteria/Fuction/Goods/V/ASGoodsGuaranteeInfoCell.m
  15. 16 0
      Asteria/Fuction/Goods/V/ASGoodsReviewFootCell.h
  16. 52 0
      Asteria/Fuction/Goods/V/ASGoodsReviewFootCell.m
  17. 22 3
      Asteria/Fuction/Goods/VC/ASGoodsDetailsViewController.m
  18. 7 2
      Asteria/Fuction/UserCenter/Orders/Controller/ASOrderDetailsViewController.m
  19. 26 0
      Asteria/Fuction/UserCenter/Orders/View/ASOrderDetailsItemsCell.m
  20. 2 2
      Asteria/Fuction/UserCenter/Orders/View/ASPayFinishHeadView.m
  21. 1 1
      Asteria/NetTools/ASNetTools.m
  22. 8 2
      Podfile
  23. 44 1
      Podfile.lock
  24. 44 1
      Pods/Manifest.lock
  25. 34983 27609
      Pods/Pods.xcodeproj/project.pbxproj
  26. 175 0
      Pods/Target Support Files/Pods-Asteria-NotificationServiceExtension/Pods-Asteria-NotificationServiceExtension-acknowledgements.markdown
  27. 217 0
      Pods/Target Support Files/Pods-Asteria-NotificationServiceExtension/Pods-Asteria-NotificationServiceExtension-acknowledgements.plist
  28. 3 3
      Pods/Target Support Files/Pods-Asteria-NotificationServiceExtension/Pods-Asteria-NotificationServiceExtension.debug.xcconfig
  29. 3 3
      Pods/Target Support Files/Pods-Asteria-NotificationServiceExtension/Pods-Asteria-NotificationServiceExtension.release.xcconfig
  30. 175 0
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria-acknowledgements.markdown
  31. 217 0
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria-acknowledgements.plist
  32. 7 0
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria-frameworks-Debug-input-files.xcfilelist
  33. 7 0
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria-frameworks-Debug-output-files.xcfilelist
  34. 7 0
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria-frameworks-Release-input-files.xcfilelist
  35. 7 0
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria-frameworks-Release-output-files.xcfilelist
  36. 14 0
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria-frameworks.sh
  37. 4 4
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria.debug.xcconfig
  38. 4 4
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria.release.xcconfig

+ 26 - 2
Asteria.xcodeproj/project.pbxproj

@@ -227,6 +227,8 @@
 		8810F59C2BFB3A4500346FD4 /* ASGoodsIntrouduceWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F59B2BFB3A4500346FD4 /* ASGoodsIntrouduceWebView.m */; };
 		8810F59F2BFC7D7600346FD4 /* ASGoodsReviewHeadCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F59E2BFC7D7600346FD4 /* ASGoodsReviewHeadCell.m */; };
 		8810F5A22BFF448C00346FD4 /* ASMyCartNoDataView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F5A12BFF448C00346FD4 /* ASMyCartNoDataView.m */; };
+		8810F5A82C01849C00346FD4 /* ASGoodsReviewFootCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F5A72C01849C00346FD4 /* ASGoodsReviewFootCell.m */; };
+		8810F5AB2C045FD600346FD4 /* ToolStripePayment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8810F5AA2C045FD600346FD4 /* ToolStripePayment.swift */; };
 		8C24ECE114420CDEE7B9B22B /* Pods_Asteria.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54DCE8001991D89B696E7D44 /* Pods_Asteria.framework */; };
 		9A1247942A1B082300126226 /* Fuction_Tool.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A1247932A1B082300126226 /* Fuction_Tool.m */; };
 		9A1247972A1B0A2800126226 /* AS_ForgotC.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A1247962A1B0A2800126226 /* AS_ForgotC.m */; };
@@ -802,6 +804,10 @@
 		8810F59E2BFC7D7600346FD4 /* ASGoodsReviewHeadCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASGoodsReviewHeadCell.m; sourceTree = "<group>"; };
 		8810F5A02BFF448C00346FD4 /* ASMyCartNoDataView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASMyCartNoDataView.h; sourceTree = "<group>"; };
 		8810F5A12BFF448C00346FD4 /* ASMyCartNoDataView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASMyCartNoDataView.m; sourceTree = "<group>"; };
+		8810F5A62C01849C00346FD4 /* ASGoodsReviewFootCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASGoodsReviewFootCell.h; sourceTree = "<group>"; };
+		8810F5A72C01849C00346FD4 /* ASGoodsReviewFootCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASGoodsReviewFootCell.m; sourceTree = "<group>"; };
+		8810F5A92C045FD600346FD4 /* Asteria-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Asteria-Bridging-Header.h"; sourceTree = "<group>"; };
+		8810F5AA2C045FD600346FD4 /* ToolStripePayment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ToolStripePayment.swift; sourceTree = "<group>"; };
 		9A1247922A1B082300126226 /* Fuction_Tool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Fuction_Tool.h; sourceTree = "<group>"; };
 		9A1247932A1B082300126226 /* Fuction_Tool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Fuction_Tool.m; sourceTree = "<group>"; };
 		9A1247952A1B0A2800126226 /* AS_ForgotC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AS_ForgotC.h; sourceTree = "<group>"; };
@@ -1927,8 +1933,10 @@
 		8810F52D2BF3676900346FD4 /* PayManager */ = {
 			isa = PBXGroup;
 			children = (
+				8810F5AA2C045FD600346FD4 /* ToolStripePayment.swift */,
 				8810F52E2BF3678400346FD4 /* ASCheckoutPayManager.h */,
 				8810F52F2BF3678400346FD4 /* ASCheckoutPayManager.m */,
+				8810F5A92C045FD600346FD4 /* Asteria-Bridging-Header.h */,
 			);
 			path = PayManager;
 			sourceTree = "<group>";
@@ -2514,6 +2522,8 @@
 				8810F5982BFB2B2400346FD4 /* ASGoodsGuaranteeInfoCell.m */,
 				8810F59D2BFC7D7600346FD4 /* ASGoodsReviewHeadCell.h */,
 				8810F59E2BFC7D7600346FD4 /* ASGoodsReviewHeadCell.m */,
+				8810F5A62C01849C00346FD4 /* ASGoodsReviewFootCell.h */,
+				8810F5A72C01849C00346FD4 /* ASGoodsReviewFootCell.m */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -2720,6 +2730,7 @@
 				TargetAttributes = {
 					8172449929F3B2ED005FA9C9 = {
 						CreatedOnToolsVersion = 14.2;
+						LastSwiftMigration = 1530;
 					};
 					817244B929F3B81C005FA9C9 = {
 						CreatedOnToolsVersion = 14.2;
@@ -2896,6 +2907,7 @@
 				81601FE62A2DB19300E4A8F1 /* ASHomeViewController.m in Sources */,
 				9A2415BC2B6784A500A6E903 /* MyCartItemCell.m in Sources */,
 				81354BF22A287B120082C93A /* KWMineHomeOrderModel.m in Sources */,
+				8810F5A82C01849C00346FD4 /* ASGoodsReviewFootCell.m in Sources */,
 				9A2415B92B677DDF00A6E903 /* Target_Cart.m in Sources */,
 				8810F5672BF5EBF400346FD4 /* ASOrderListViewController.m in Sources */,
 				81E73EBD2B1AABF300C10938 /* ASGiftCardListViewModel.m in Sources */,
@@ -2938,6 +2950,7 @@
 				817244B029F3B2EE005FA9C9 /* main.m in Sources */,
 				8131A2872B36890200A191BE /* ASWindowManager.m in Sources */,
 				81717D202A3C4AE000648139 /* KWSearchSubTypeCell.m in Sources */,
+				8810F5AB2C045FD600346FD4 /* ToolStripePayment.swift in Sources */,
 				9A3F5CAB2B3BBEAB00DDB6A7 /* GoodsDetailsPayV.m in Sources */,
 				81C796242A4FD63A003083B8 /* ASVipCouponsViewController.m in Sources */,
 				9AEFA7DE2B649F4000AE1974 /* MyCarlTableV.m in Sources */,
@@ -3331,6 +3344,7 @@
 				APPLICATION_EXTENSION_API_ONLY = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Asteria/Asteria.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
@@ -3344,7 +3358,7 @@
 				INFOPLIST_KEY_UIMainStoryboardFile = "";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
 				INFOPLIST_KEY_UIUserInterfaceStyle = Light;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -3354,6 +3368,9 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.info.LYAsteria.Asteria;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "Asteria/Fuction/Cart/PayManager/Asteria-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -3365,6 +3382,7 @@
 				APPLICATION_EXTENSION_API_ONLY = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Asteria/Asteria.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
@@ -3378,7 +3396,7 @@
 				INFOPLIST_KEY_UIMainStoryboardFile = "";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
 				INFOPLIST_KEY_UIUserInterfaceStyle = Light;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -3387,6 +3405,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.info.LYAsteria.Asteria;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "Asteria/Fuction/Cart/PayManager/Asteria-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -3395,6 +3415,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F28014612B0095476AA5BC1B /* Pods-Asteria-NotificationServiceExtension.debug.xcconfig */;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = BUGL3DWWB7;
@@ -3410,6 +3431,7 @@
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.info.LYAsteria.Asteria.NotificationServiceExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -3420,6 +3442,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 3757F38E691966CC4F482D46 /* Pods-Asteria-NotificationServiceExtension.release.xcconfig */;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = BUGL3DWWB7;
@@ -3435,6 +3458,7 @@
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.info.LYAsteria.Asteria.NotificationServiceExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";

+ 22 - 1
Asteria/AppDelegate.m

@@ -10,6 +10,9 @@
 #import <YTKNetwork/YTKNetwork.h>
 #import <FBSDKLoginKit/FBSDKLoginKit.h>
 
+#import <StripeCore/StripeCore-Swift.h>
+@import Stripe;
+
 @interface AppDelegate ()
 
 //@property (nonatomic, strong, readonly) UIWindow *window;
@@ -46,7 +49,7 @@
     [self.window makeKeyAndVisible];
     
     
-    
+    [StripeAPI setDefaultPublishableKey:@"pk_test_51MFDGRAxgV55iyHtmJFrPuz4i5cl1y3nhTLVT3EmsHlYLIwsj7TnPRPeulAUXSbOW7gccaVLJmFjVz4eu3E17g6z00TLI1YvoG"];
 
     
     return YES;
@@ -112,6 +115,24 @@
     
 }
 
+#pragma mark - **************** applicationDelegate  ****************
+- (BOOL)application:(UIApplication *)app
+            openURL:(NSURL *)url
+            options:(NSDictionary *)options {
+    
+    [[FBSDKApplicationDelegate sharedInstance] application:app openURL:url options:options];
+    
+  
+    // nzk Google Signin
+    BOOL stripeHandled = [StripeAPI handleStripeURLCallbackWithURL:url];
+    if(stripeHandled){
+        return YES;
+    }
+    // nzk Google Signin end
+    
+    return YES;
+}
+
 
 
 

+ 24 - 65
Asteria/Fuction/Cart/Cart_CheckoutC.m

@@ -71,6 +71,9 @@
     [self requestGetShipMethodByAddress];
     //获取购物车信息(地址信息)
     [self requestCartInfo];
+    if (!self.totalsM) {
+        [self reqNet_Cart_cartsMineTotals];
+    }
 }
 
 - (void)initSubviews {
@@ -274,17 +277,7 @@
             self.addGiftView.hidden = NO;
             [self.addGiftView setGiftData:model.add_gooodsImgUrl];
         }
-    } else if ([mark isEqualToString:Chectout_Verify_PayToken]) {
-        //校验支付token结果返回
-        if(sucessOrFail){
-            NSDictionary *payReturnDic = (NSDictionary *)data;
-            [self paymentResultStatus:[payReturnDic objectForKey:@"id"]];
-        }else{
-            [self.view makeToast:(NSString *)data duration:2 position:CSToastPositionCenter];
-        }
     }
-    
-    
 }
 
 - (void)updateData{
@@ -483,18 +476,14 @@
     [self.VM ry_requestDeleteApi:Chectout_DEL_cancelusePoints paramStr:@""];
 }
 
-//根据支付返回的token去服务端校验
-- (void)requestVerifyPayToken:(NSString *)payToken {
-    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
-    [self.VM ry_requestGetApi:Chectout_Verify_PayToken param:@{@"token":payToken}];
-}
-
 //下单
 -(void)requestSureOrder{
     
     NSString *paymentCode = self.paymentModel.code;
     
-    [[ASCheckoutPayManager sharedInstance] checkoutPayWithMethodType:paymentCode];
+    [ASCheckoutPayManager sharedInstance].cartId = self.totalsM.cart_id;
+    [ASCheckoutPayManager sharedInstance].addressModel = self.addressCellM.addressModel;
+    [[ASCheckoutPayManager sharedInstance] checkoutPayWithMethodType:paymentCode param:@{@"price":self.totalsM.grand_total, @"currency":self.totalsM.currency_symbol}];
     K_WEAK_SELF;
     [ASCheckoutPayManager sharedInstance].payFinishBlock = ^(NSString * _Nonnull payMethod, NSUInteger isSucess, id  _Nonnull payData) {
         K_STRONG_SELF;
@@ -502,12 +491,27 @@
         if (isSucess == 1) {
             
             [self.view makeToast:@"支付成功,正在为你下单" duration:0.5 position:CSToastPositionCenter];
-            
             K_WEAK_SELF;
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 K_STRONG_SELF;
-                //支付失败
-                [self requestVerifyPayToken:[(NSDictionary *)payData objectForKey:@"token"]];
+                
+                NSDictionary *payDic = (NSDictionary *)payData;
+                
+                NSString *orderidStr = [NSString stringWithFormat:@"%@", [payDic objectForKey:@"orderid"]];
+                
+                [self paymentResultStatus:orderidStr];
+                
+//                if ([payMethod isEqualToString:@"paypal_express"]) {
+//                    [self paymentResultStatus:orderidStr];
+//                } else if ([payMethod isEqualToString:@"stripe_payments"]) {//visa
+//                    [self paymentResultStatus:orderidStr];
+//                } else if ([payMethod isEqualToString:@"afterpay_payment"]) {//afterpay
+//                    
+//                } else if ([payMethod isEqualToString:@"klarna_kco"]) {//klarna
+////                    NSString *orderidStr = [NSString stringWithFormat:@"%@", [payDic objectForKey:@"orderid"]];
+//
+//                }
+                 
             });
             
         } else {
@@ -522,51 +526,6 @@
             
         }
     };
-    return;
-    
-    if ([paymentCode isEqualToString:@"paypal_express"]) {//paypal
-        
-        
-        
-        return;
-        
-//        for (int i=0; i<self.totalCellM.total_segments.count; i++) {
-//            NSDictionary *dic = self.totalCellM.total_segments[i];
-//            NSString *code = MM_str(dic[@"code"]);
-//            if ([code isEqualToString:@"grand_total"]){ //subBottomV
-//                NSString *priceStr = [NSString stringWithFormat:@"%@",dic[@"value"]];
-////                [self PayPalWithAmount:priceStr currencyCode:ASCurrencyManager.shared.currentCur shortDescription:@"购买商品"];
-//                return;
-//
-//            }
-//        }
-        return;
-    } else if ([paymentCode isEqualToString:@"stripe_payments"]) {//visa
-        
-    } else if ([paymentCode isEqualToString:@"afterpay_payment"]) {//afterpay
-        
-    } else if ([paymentCode isEqualToString:@"klarna_kco"]) {//klarna
-        
-    } else {
-        
-    }
-    
-    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
-    NSDictionary *param = @{@"method":paymentCode};
-//    K_WEAK_SELF;
-    [ASNetTools.shared putWithPath:Chectout_PUT_sureOrder param:@{@"paymentMethod":param} success:^(id _Nonnull json) {
-        K_STRONG_SELF;
-        [MBProgressHUD hideHUDForView:self.view animated:YES];
-        NSLog(@"=======%@", json);
-        
-        [self paymentResultStatus:[json objectForKey:@"data"]];
-        
-    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
-        K_STRONG_SELF;
-        [MBProgressHUD hideHUDForView:self.view animated:YES];
-        NSLog(@"=======%@=====%@", code, msg);
-        [self paymentResultStatus:@""];
-    }];
 }
 
 - (void)paymentResultStatus:(NSString *)orderid {

+ 4 - 3
Asteria/Fuction/Cart/Cell/MyCartGrandTotalCell.m

@@ -86,12 +86,12 @@
             [self.subBottomV xxx_configTips:dic[@"title"] price:priceStr];
         }else{ //stackSubTopV
             NSString *priceStr = @"0";
-            if([code isEqualToString:@"discount"]){
+            if([code isEqualToString:@"discount"] || [code isEqualToString:@"mageworx_rewardpoints_spend"]){
                 if([dic[@"value"] floatValue] <0.00){
-                    CGFloat temF =fabsf([dic[@"value"] floatValue]);
+                    float temF =fabsf([dic[@"value"] floatValue]);
                     priceStr =   [NSString stringWithFormat:@"-%@%.2f",model.currency_symbol,temF];
                 }
-            }else{
+            } else{
                 priceStr = [NSString stringWithFormat:@"%@%@",model.currency_symbol,dic[@"value"]];
             }
             SubtotalCellItemV *itemV = [[SubtotalCellItemV alloc] init];
@@ -180,6 +180,7 @@
         make.left.mas_equalTo(0);
         make.top.mas_equalTo(0);
         make.height.mas_equalTo(30);
+        make.right.mas_equalTo(-100);
     }];
     [self.priceLab mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.tipsLab.mas_right).offset(10);

+ 14 - 0
Asteria/Fuction/Cart/Checkout/ASCheckoutPointApplyCell.m

@@ -14,6 +14,7 @@
 @interface ASCheckoutPointApplyCell ()
 @property (nonatomic, strong) UIView *bgView;
 @property (nonatomic, strong) UILabel *titleLab;
+@property (nonatomic, strong) UILabel *priceLab;
 @property (nonatomic, strong) TT_CustonTF  *codeTF;
 @property (nonatomic, strong) UIButton *applyBtn;
 @property (nonatomic, strong) QMUILabel *pointDesLab;
@@ -54,6 +55,7 @@
         make.right.mas_equalTo(-10);
         make.bottom.mas_equalTo(0);
     }];
+    
     [self.titleLab mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(10);
         make.top.mas_equalTo(20);
@@ -61,6 +63,16 @@
         make.right.mas_equalTo(-100);
     }];
     
+    _priceLab = [UILabel labelCreateWithText:@"" font:[UIFont fontWithName:Rob_Bold size:14] textColor:_0B0B0B];
+    _priceLab.textAlignment = NSTextAlignmentRight;
+    _priceLab.adjustsFontSizeToFitWidth = YES;
+    [self.bgView addSubview:_priceLab];
+    [_priceLab mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.titleLab.mas_right).offset(20);
+        make.right.mas_equalTo(-10);
+        make.centerY.mas_equalTo(self.titleLab);
+    }];
+    
     [applyTmpV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.titleLab.mas_bottom).offset(20);
         make.left.mas_equalTo(10);
@@ -115,6 +127,8 @@
         self.applyBtn.selected = NO;
     }
     
+    _priceLab.text = [NSString stringWithFormat:@"-%@%@", model.priceSymbol, model.usePrice];
+    
     NSString *pointStr = [NSString stringWithFormat:@"You have %@ Reward Points available.", model.pointBalance];
     NSString *pointLastStr = [NSString stringWithFormat:@"%@ point = %@%@. Input points value below to redeem.", model.pointScale, model.priceSymbol, model.priceScale];
     

+ 2 - 1
Asteria/Fuction/Cart/Checkout/CartCheckTableV.m

@@ -13,6 +13,7 @@
     NSObject *objectM = self.infodata[indexPath.row];
     if([objectM isKindOfClass:[CartTotalsItemsM class]]){
         ASCheckoutGoodsItemCell *cell = [ASCheckoutGoodsItemCell cellWithTableView:tableView CellClass:[ASCheckoutGoodsItemCell class]];
+        cell.clipsToBounds = YES;
         
         [cell configData:(CartTotalsItemsM *)objectM];
         @weakify(self)
@@ -95,7 +96,7 @@
     
     NSObject *objectM = self.infodata[indexPath.row];
     if([objectM isKindOfClass:[CartTotalsItemsM class]] && self.isFlod){
-        return 0;
+        return 0.0001;
     }
     
     return UITableViewAutomaticDimension;

+ 9 - 7
Asteria/Fuction/Cart/PayManager/ASCheckoutPayManager.h

@@ -6,13 +6,11 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "ASUserModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-//#define WebBase_Server ([NSUserDefaults.standardUserDefaults boolForKey:LastNetState] == true ? @"https://ios.alipearlhair.com/" : @"https://alipearlapp.snjon.com/")
-
-#define WebBase_Server @"https://alipearlapp.snjon.com/"
-
+#define PayStripepublishableKey      @"pk_test_51MFDGRAxgV55iyHtmJFrPuz4i5cl1y3nhTLVT3EmsHlYLIwsj7TnPRPeulAUXSbOW7gccaVLJmFjVz4eu3E17g6z00TLI1YvoG"
 
 #define Chectout_Pay_Paypal_Url      BaseRequestrUrl(@"rewrite/paypal/getPaypalToken")
 #define Chectout_Pay_Klarna_Url      BaseRequestrUrl(@"rewrite/klarna/getKlarnaToken")
@@ -24,11 +22,15 @@ typedef void(^ASPayFinishBlock)(NSString *payMethod, NSUInteger isSucess , id pa
 
 @property (nonatomic, copy) ASPayFinishBlock payFinishBlock;
 
-+ (instancetype)sharedInstance;
+//购物车id(klarna支付生成订单用到)
+@property (nonatomic, copy) NSString *cartId;
+//地址信息(stripe支付sdk用到)
+@property (nonatomic, strong) ASAddressModel *addressModel;
 
-- (void)checkoutPayWithMethodType:(NSString *)payType;
 
-- (void)checkoutPayWithMethodType:(NSString *)payType completion:(void (^ __nullable)(NSUInteger isSucess , id payData))completion;
++ (instancetype)sharedInstance;
+
+- (void)checkoutPayWithMethodType:(NSString *)payType param:(NSDictionary *)payParam;
 
 @end
 

+ 187 - 58
Asteria/Fuction/Cart/PayManager/ASCheckoutPayManager.m

@@ -8,13 +8,18 @@
 #import "ASCheckoutPayManager.h"
 #import <KlarnaMobileSDK/KlarnaMobileSDK-Swift.h>
 
+#import "Asteria-Swift.h"
+
+#import "CartVM.h"
+
+//Asteria-Bridging-Header
+
 @interface ASCheckoutPayManager()<KlarnaEventHandler,KlarnaPaymentEventListener>
 
 @property (nonatomic, copy) NSString *payType;
 
 @property (nonatomic, strong) KlarnaPaymentView *klarna_payV;
 @property (nonatomic, strong) NSString *client_token;
-@property (nonatomic, strong) NSString *author_token;
 
 @end
 
@@ -31,7 +36,7 @@ static ASCheckoutPayManager *_instance = nil;
     return _instance;
 }
 
-- (void)checkoutPayWithMethodType:(NSString *)payType {
+- (void)checkoutPayWithMethodType:(NSString *)payType param:(NSDictionary *)payParam {
     
     self.payType = payType;
     
@@ -49,15 +54,40 @@ static ASCheckoutPayManager *_instance = nil;
             dispatch_async(dispatch_get_main_queue(), ^{
                 [self tool_gotoWebPay:urlStr withVC:topVC];
             });
-            
-            NSLog(@"=====%@", json);
         } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
-            K_STRONG_SELF;
+//            K_STRONG_SELF;
             [MBProgressHUD hideHUDForView:topVC.view animated:YES];
         }];
         
     } else if ([payType isEqualToString:@"stripe_payments"]) {//visa
         
+        double totalPay = [[payParam objectForKey:@"price"] doubleValue];
+        ToolStripePayment *payment = [[ToolStripePayment alloc]init];
+        NSString *price_unit_code = ASCurrencyManager.shared.currentCur;
+        if (price_unit_code.isEmpty) {
+            price_unit_code = @"USD";
+        }
+        
+        [payment stripedidTapCheckoutButtonWithCurrentvc:[Current_normalTool topViewController] publishableKey:PayStripepublishableKey reqbaseUrl:BaseRequestrUrl(@"carts/mine/order") amount:totalPay*100 currency:price_unit_code addressModel:self.addressModel completion:nil];
+        
+        payment.payFinishBlock = ^(NSString *status, NSString *orderid) {
+            int statusInt = [status intValue];
+            if (statusInt == 0) {
+                if (self.payFinishBlock) {
+                    self.payFinishBlock(self.payType, 1, @{@"orderid":orderid});
+                }
+            } else if (statusInt == 1) {
+                //二次验证
+                [self stripePayCreateOrderid:orderid];
+            } else if (statusInt == 2) {
+//                [topVC.view makeToast:@"您已取消支付"];
+            } else {
+                if (self.payFinishBlock) {
+                    self.payFinishBlock(self.payType, 0, @{@"msg":@"支付失败"});
+                }
+            }
+        };
+
     } else if ([payType isEqualToString:@"afterpay_payment"]) {//afterpay
         
     } else if ([payType isEqualToString:@"klarna_kco"]) {//klarna
@@ -75,67 +105,162 @@ static ASCheckoutPayManager *_instance = nil;
             
             NSLog(@"=====%@", json);
         } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
-            K_STRONG_SELF;
+            /*K_STRONG_SELF*/;
             [MBProgressHUD hideHUDForView:topVC.view animated:YES];
             
         }];
     } else {
-        
+        //货到付款
+        [self stripePayCreateOrderid:@""];
     }
 }
 
+#pragma mark ----- stripe支付 、 货到付款方式-----
+//stripe支付(二次校验后生成订单)
+- (void)stripePayCreateOrderid:(NSString *)payid {
+    UIViewController *topVC = topViewController();
+    
+    NSDictionary *requestParams = nil;
+    if ([payid isEqualToString:@""]) {//货到付款方式
+        requestParams = @{@"paymentMethod":self.payType};
+    } else {//stripe支付
+        NSDictionary *methodDic = @{@"payment_method":payid,
+                                    @"manual_authentication":@"card",
+                                    @"payment_element":@(YES)};
+        NSDictionary *param = @{@"method":self.payType, @"additional_data":methodDic};
+        requestParams = @{@"paymentMethod":param};
+    }
+    
+    [MBProgressHUD showHUDAddedTo:topVC.view animated:YES];
+    K_WEAK_SELF;
+    [ASNetTools.shared putWithPath:Chectout_PUT_sureOrder param:requestParams success:^(id _Nonnull json) {
+        K_STRONG_SELF;
+        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+        
+        NSString *orderid = (NSString *)json;
+        if (self.payFinishBlock) {
+            self.payFinishBlock(self.payType, 1, @{@"orderid":orderid});
+        }
+        
+    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+        K_STRONG_SELF;
+        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+        if (self.payFinishBlock) {
+            self.payFinishBlock(self.payType, 0, @{@"msg":msg});
+        }
+    }];
+}
 
+#pragma mark ----- PayPal支付 -----
+//paypal支付
 - (void)tool_gotoWebPay:(NSString *)urlStr withVC:(UIViewController *)tmpvc {
     XXX_BaseWebC *vc = [[XXX_BaseWebC alloc] init];
     vc.isPayType = YES;
+    K_WEAK_SELF;
     vc.WebViewBlock = ^(NSUInteger status, id  _Nonnull webData) {
-        
-        if (self.payFinishBlock) {
-            self.payFinishBlock(self.payType, status, webData);
-        }
+        K_STRONG_SELF;
+        [self requestVerifyPaypalToken:webData];
     };
     [vc xxx_dsWebLoadUrl:urlStr];
     vc.modalPresentationStyle = UIModalPresentationFullScreen;
     [tmpvc presentViewController:vc animated:YES completion:nil];
 }
 
+//paypal支付 Token验证
+- (void)requestVerifyPaypalToken:(NSDictionary *)dic {
+    UIViewController *topVC = topViewController();
+    
+    NSDictionary *params = @{@"token":[dic objectForKey:@"token"]};
+    [MBProgressHUD showHUDAddedTo:topVC.view animated:YES];
+    K_WEAK_SELF;
+    [ASNetTools.shared postWithPath:Chectout_Verify_PayToken param:params success:^(id _Nonnull json) {
+        K_STRONG_SELF;
+        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+        
+        NSDictionary *payReturnDic = (NSDictionary *)json;
+        NSString *orderid = [payReturnDic objectForKey:@"id"];
+        if (self.payFinishBlock) {
+            self.payFinishBlock(self.payType, 1, @{@"orderid":orderid});
+        }
+        
+    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+        K_STRONG_SELF;
+        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+        if (self.payFinishBlock) {
+            self.payFinishBlock(self.payType, 0, @{@"msg":msg});
+        }
+    }];
+}
+
+#pragma mark ----- klarna支付验证 -----
+//klarna支付验证
+-(void)tool_verifyOrderAutoken:(NSString *)authToken{
+    
+    UIViewController *topVC = topViewController();
+    
+    NSDictionary *params = @{@"authorization_token":authToken};
+    
+    [MBProgressHUD showHUDAddedTo:topVC.view animated:YES];
+    K_WEAK_SELF;
+    [ASNetTools.shared postWithPath:Chectout_Verify_KlarnaCart param:params success:^(id _Nonnull json) {
+        K_STRONG_SELF;
+        
+        NSString *is_active = [(NSDictionary *)json objectForKey:@"is_active"];
+        NSLog(@"=======%@", is_active);
+        if ([is_active isEqualToString:@"1"]) {
+            [self tool_creatOrderAutoken:authToken];
+        } else {
+            
+        }
+        
+    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+        K_STRONG_SELF;
+        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+        
+        if (self.payFinishBlock) {
+            self.payFinishBlock(self.payType, 0, @{@"msg":msg});
+        }
+    }];
+}
 
+//klarna支付
 -(void)tool_creatOrderAutoken:(NSString *)authToken{
     UIViewController *topVC = topViewController();
 
     self.client_token = authToken;
-//    //klarna_4 授权成功,创建订单
-//    NSString *klarnaUrl = [NSString stringWithFormat:@"%@firecheckout/index/saveOrderKlarna",WebBase_Server];
-//    NSMutableDictionary *paraDic = [NSMutableDictionary dictionary];
-//    [paraDic setObject:@"klarna_payments" forKey:@"payment[method]"];
-//    [paraDic setObject:authToken forKey:@"payment[authorization_token]"];
+    
+    
+    NSDictionary *additional_data = @{@"authorization_token":authToken};
+    
+    NSDictionary *payType = @{@"method":@"klarna_pay_over_time",
+                              @"additional_data":additional_data};
+    NSDictionary *params = @{@"paymentMethod":payType,
+                             @"cartId":self.cartId};
+    
 //    [MBProgressHUD showHUDAddedTo:topVC.view animated:YES];
-//    [PPNetworkHelper POST:klarnaUrl parameters:paraDic success:^(id responseObject) {
-//        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
-//        if(RequestSuccess){
-//            NSDictionary *dic = (NSDictionary *)responseObject[@"data"];
-//            NSString *order_id = MM_str(dic[@"order_id"]);
-////            [tepC tool_payMentSucessOrderId:order_id];
-//        }else{
-////            [tepC tool_payMentFaild];
-//        }
-//    } failure:^(NSError *error) {
-//        [MBProgressHUD hideHUDForView:topVC.view
-//                             animated:YES];
-//        [topVC.view makeToast:ReqNetWorkFaild
-//                     duration:2
-//                     position:CSToastPositionCenter];
-//    }];
+    K_WEAK_SELF;
+    [ASNetTools.shared postWithPath:Chectout_Verify_KlarnaToken param:params success:^(id _Nonnull json) {
+        K_STRONG_SELF;
+        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+        
+        NSString *orderid = (NSString *)json;
+        NSLog(@"=======%@", orderid);
+        if (self.payFinishBlock) {
+            self.payFinishBlock(self.payType, 1, @{@"orderid":orderid});
+        }
+        
+    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+        K_STRONG_SELF;
+        [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+        
+        if (self.payFinishBlock) {
+            self.payFinishBlock(self.payType, 0, @{@"msg":msg});
+        }
+    }];
 }
 
 
-#pragma mark - **************** KlarnaEventHandler ****************
-- (void)klarnaComponent:(id <KlarnaComponent> _Nonnull)klarnaComponent dispatchedEvent:(KlarnaProductEvent * _Nonnull)event{
-    NSLog(@"klarna---111---%@",event.qmui_allBindingKeys);
-}
-- (void)klarnaComponent:(id <KlarnaComponent> _Nonnull)klarnaComponent encounteredError:(KlarnaError * _Nonnull)error{
-    NSLog(@"klarna---222---error:%@",error);
-}
+
 #pragma mark - **************** KlarnaPaymentEventListener ****************
 - (void)klarnaInitializedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView { //init 成功
     NSLog(@"klarna---888---%@",self.client_token);
@@ -144,32 +269,19 @@ static ASCheckoutPayManager *_instance = nil;
     //klarna_3 授权支付操作 klarna_getClientTokenAurhorizePay
     [self.klarna_payV authorizeWithAutoFinalize:YES jsonData:self.client_token];
 }
-- (void)klarnaLoadedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView {
-    NSLog(@"klarna---333---%@",paymentView);
-//    self.bottomPaybtn.backgroundColor = [UIColor colorWithHexString:@"#B2000F"];
-//    self.bottomPaybtn.userInteractionEnabled = YES;
 
-}
-- (void)klarnaLoadedPaymentReviewWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView {
-    NSLog(@"klarna---444---%@",paymentView);
-
-
-}
 - (void)klarnaAuthorizedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView approved:(BOOL)approved authToken:(NSString * _Nullable)authToken finalizeRequired:(BOOL)finalizeRequired {
     
-    NSLog(@"klarna---555---%@",authToken);
+    NSLog(@"klarna---555---%@--approved---%d",authToken, approved);
     
     if (approved == true ){
         NSLog(@"klarna 授权支付成功");
-//        if (self.payFinishBlock) {
-//            self.payFinishBlock(self.payType, 1, @{@"token":authToken});
-//        }
-//        self.author_token = authToken;
-//        [self tool_creatOrderAutoken:authToken];
+        [self tool_verifyOrderAutoken:authToken];
+        
     } else {
-//        if (self.payFinishBlock) {
-//            self.payFinishBlock(self.payType, 0, @{@"token":authToken});
-//        }
+        if (self.payFinishBlock) {
+            self.payFinishBlock(self.payType, 0, @{@"msg":@"支付失败"});
+        }
         NSLog(@"klarna 授权支付失败");
     }
 }
@@ -179,6 +291,13 @@ static ASCheckoutPayManager *_instance = nil;
         [self tool_creatOrderAutoken:authToken];
     }
 }
+#pragma mark - **************** KlarnaEventHandler ****************
+- (void)klarnaComponent:(id <KlarnaComponent> _Nonnull)klarnaComponent dispatchedEvent:(KlarnaProductEvent * _Nonnull)event{
+    NSLog(@"klarna---111---%@",event.qmui_allBindingKeys);
+}
+- (void)klarnaComponent:(id <KlarnaComponent> _Nonnull)klarnaComponent encounteredError:(KlarnaError * _Nonnull)error{
+    NSLog(@"klarna---222---error:%@",error);
+}
 - (void)klarnaResizedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView to:(CGFloat)newHeight {
 //    [self.klarna_payV mas_updateConstraints:^(MASConstraintMaker *make) {
 //        make.height.mas_equalTo(newHeight);
@@ -191,7 +310,17 @@ static ASCheckoutPayManager *_instance = nil;
 - (void)klarnaFinalizedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView approved:(BOOL)approved authToken:(NSString * _Nullable)authToken { 
     
 }
+- (void)klarnaLoadedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView {
+    NSLog(@"klarna---333---%@",paymentView);
+//    self.bottomPaybtn.backgroundColor = [UIColor colorWithHexString:@"#B2000F"];
+//    self.bottomPaybtn.userInteractionEnabled = YES;
+
+}
+- (void)klarnaLoadedPaymentReviewWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView {
+    NSLog(@"klarna---444---%@",paymentView);
+
 
+}
 
 #pragma mark - **************** lazy ****************
 -(KlarnaPaymentView *)klarna_payV{

+ 7 - 0
Asteria/Fuction/Cart/PayManager/Asteria-Bridging-Header.h

@@ -0,0 +1,7 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+#import "PPNetworkHelper.h"
+#import "ASNetTools.h"
+#import "ASUserModel.h"

+ 187 - 0
Asteria/Fuction/Cart/PayManager/ToolStripePayment.swift

@@ -0,0 +1,187 @@
+//
+//  ToolStripePayment.swift
+//  westkissMob
+//
+//  Created by 王猛 on 2023/9/4.
+//
+
+import Foundation
+import UIKit
+import StripePaymentSheet
+import Stripe
+
+public typealias tt_currenttapclosure = (NSInteger , Any)->()
+
+
+public class ToolStripePayment: NSObject {
+    
+    @objc public var payFinishBlock:((String, String)->())?
+    
+    @objc public var order_id:String = ""
+    @objc public var paymentMethodID:String = ""
+    @objc public var req_baseUrl:String = ""
+    
+    @objc public var currentVC:UIViewController = UIViewController()
+    @Published var paymentSheet: PaymentSheet?
+//    @Published var paymentResult: PaymentSheetResult?
+    
+    @objc public func stripedidTapCheckoutButton(currentvc
+                                                 vc:UIViewController?,
+                                                 publishableKey:String,
+                                                 reqbaseUrl:String,
+                                                 amount:Int,
+                                                 currency:String,
+                                                 addressModel:ASAddressModel?,
+                                                 completion:tt_currenttapclosure?){
+        
+        currentVC = vc!
+        req_baseUrl = reqbaseUrl
+        STPAPIClient.shared.publishableKey = publishableKey;
+        let intentConfig = PaymentSheet.IntentConfiguration(
+          mode: .payment(amount: amount, currency: currency)
+        ) { [self]  paymentMethod, shouldSavePaymentMethod, intentCreationCallback in
+            self.stripehandleConfirm(paymentMethod, shouldSavePaymentMethod, intentCreationCallback)
+        }
+        
+        
+        var configuration = PaymentSheet.Configuration()
+        configuration.defaultBillingDetails.email = addressModel?.email
+//        let string1:str = addressModel?.firstname
+//        let string2 = "World!"
+//        let combinedString = string1 + string2
+        configuration.defaultBillingDetails.name = String(addressModel!.firstname + addressModel!.firstname)
+        configuration.defaultBillingDetails.phone = addressModel?.telephone
+        
+        configuration.defaultBillingDetails.address.city = addressModel?.city
+        configuration.defaultBillingDetails.address.country = addressModel?.country
+        configuration.defaultBillingDetails.address.postalCode = addressModel?.postcode
+        configuration.defaultBillingDetails.address.state = addressModel?.region.region
+        configuration.defaultBillingDetails.address.line1 =  addressModel?.street.first
+        
+//        print("=====street" + (addressModel?.street.first)! as Any)
+        
+//        configuration.allowsPaymentMethodsRequiringShippingAddress = true
+        
+//        STPUserInformation
+        
+//        let userInformation = STPUserInformation()
+//        userInformation.email = "用户邮箱"
+//        userInformation.phone = "用户电话"
+        
+        
+        
+//        let customer = PaymentSheet.CustomerConfiguration(id: "845600348@qq.com", ephemeralKeySecret: configuration.customer!.ephemeralKeySecret)
+//////
+//        configuration.customer = customer
+        configuration.applePay = .init(merchantId: "merchant.com.alipearlhair.app", merchantCountryCode: "US")
+        configuration.returnURL = "alipearlStripe://stripe-redirect" // Use the return url you set up in the previous step
+        configuration.allowsDelayedPaymentMethods = true
+        
+        
+        self.paymentSheet = PaymentSheet(intentConfiguration: intentConfig, configuration: configuration)
+        
+        self.paymentSheet?.present(from: vc!) { paymentResult in
+              switch paymentResult {
+              case .completed:
+                  print("sucess")
+//                  if completion != nil {
+//                      completion!(0,self.order_id)
+//                  }
+                  if self.payFinishBlock != nil {
+                      self.payFinishBlock!("1", self.paymentMethodID)
+                  }
+              case .canceled:
+                  print("Canceled!")
+//                  completion!(1,"")
+                  if self.payFinishBlock != nil {
+                      self.payFinishBlock!("2", "Canceled")
+                  }
+              case .failed(let error):
+                  print(error)
+//                  completion!(2,error)
+                  if self.payFinishBlock != nil {
+                      self.payFinishBlock!("3", "failed")
+                  }
+              }
+            }
+      }
+    
+     func stripehandleConfirm(_ paymentMethod: STPPaymentMethod, _ shouldSavePaymentMethod: Bool, _ intentCreationCallback: @escaping (Result<String, Error>) -> Void) {
+        stripeserverSideConfirmHandler(paymentMethod.stripeId, shouldSavePaymentMethod, intentCreationCallback);
+    }
+     func stripeserverSideConfirmHandler(_ paymentMethodID: String,
+                                  _ shouldSavePaymentMethod: Bool,
+                                  _ intentCreationCallback: @escaping (Result<String, Error>) -> Void) {
+        // Create and confirm an intent on your server and invoke `intentCreationCallback` with the client secret
+        stripeconfirmIntent(paymentMethodID: paymentMethodID, shouldSavePaymentMethod: shouldSavePaymentMethod) { result in
+            switch result {
+            case .success(let clientSecret):
+                intentCreationCallback(.success(clientSecret))
+            case .failure(let error):
+                intentCreationCallback(.failure(error))
+            }
+        }
+    }
+    
+    
+    func stripeconfirmIntent(paymentMethodID: String,
+                       shouldSavePaymentMethod: Bool,
+                       completion: @escaping (Result<String, Error>) -> Void) {
+        
+        self.paymentMethodID = paymentMethodID;
+        
+        let payMethod: [String: Any?] = [
+            "payment_method" : paymentMethodID,
+            "manual_authentication" : "card",
+            "payment_element" : true
+        ]
+        
+        let body: [String: Any?] = [
+            "method" : "stripe_payments",
+            "additional_data" : payMethod,
+        ]
+        
+        let param: [String: Any?] = [
+            "paymentMethod" : body
+        ]
+        
+        let order_requestUrl = req_baseUrl
+        
+        ASNetTools.shared().put(withPath: order_requestUrl, param:param as [AnyHashable : Any]) { json in
+            
+            if (json is NSNumber) {
+                let orderId = json as! Int
+                self.order_id = String(orderId)
+                
+                if self.payFinishBlock != nil {
+                    self.payFinishBlock!("0", self.order_id)
+                }
+                
+                self.currentVC.dismiss(animated: true)
+                
+            } else {
+                let clientSecret = json
+                completion(.success(clientSecret as! String))
+            }
+            
+        } faild: { code, msg in
+            
+            if msg.contains("Authentication Required:") {
+                var client_secret = msg.replacingOccurrences(of: "Authentication Required:", with: "")
+                client_secret = client_secret.replacingOccurrences(of: " ", with: "")
+                print("client_secret" + client_secret)
+                
+                completion(.success(client_secret))
+                
+            } else {
+                completion(.failure(ExampleError(errorDescription: (msg)) ))
+            }
+        }
+
+    }
+    struct ExampleError: LocalizedError {
+       var errorDescription: String?
+    }
+    
+}
+

+ 6 - 1
Asteria/Fuction/Cart/VM/CartVM.h

@@ -45,9 +45,14 @@
 //丢件险
 #define Chectout_lost_extrafee       @"rest/en/V1/amasty_extrafee/carts/mine/totals-information"
 
-//根据支付返回的token去服务端校验
+//paypal根据支付返回的token去服务端校验
 #define Chectout_Verify_PayToken     BaseRequestrUrl(@"rewrite/paypal/return")
 
+//Klarna支付购物车验证
+#define Chectout_Verify_KlarnaCart   BaseRequestrUrl(@"rewrite/klarna/checkoutQuoteStatus")
+//Klarna根据支付返回的token去服务端校验
+#define Chectout_Verify_KlarnaToken  BaseRequestrUrl(@"carts/mine/payment-information")
+
 
 NS_ASSUME_NONNULL_BEGIN
 

+ 22 - 0
Asteria/Fuction/Goods/V/ASGoodsCouponCell.m

@@ -101,8 +101,13 @@
         float itemY = 10;
         for (int i = 0; i < array.count; i++) {
             ASGoodsCouponItemView *itemView = [[ASGoodsCouponItemView alloc] initWithFrame:CGRectMake(itemX, itemY, itemWidth, 100)];
+            itemView.tag = i;
             [_couponView addSubview:itemView];
             
+            itemView.userInteractionEnabled = YES;
+            UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_clickAction:)];
+            [itemView addGestureRecognizer:tap];
+            
             if (i % 2 == 1) {
                 itemX = 10;
                 itemY = itemY + 100 + 10;
@@ -129,6 +134,10 @@
     }
 }
 
+- (void)_clickAction:(UIGestureRecognizer *)taper {
+    
+}
+
 - (void)_couponEvent:(UIButton *)button {
 //    button.selected = !button.selected;
     self.rTopBtn.selected = !self.rTopBtn.selected;
@@ -142,6 +151,10 @@
 
 @interface ASGoodsCouponItemView()
 
+@property (nonatomic, strong) UILabel *couponCodeLab;
+@property (nonatomic, strong) UILabel *couponPriceLab;
+@property (nonatomic, strong) UILabel *couponDescLab;
+
 @end
 
 
@@ -157,6 +170,15 @@
             make.edges.mas_equalTo(0);
         }];
         
+        _couponCodeLab = [UILabel labelCreateWithText:@"code:1238" font:[UIFont fontWithName:Rob_Regular size:12] textColor:_0B0B0B];
+        _couponCodeLab.textAlignment = NSTextAlignmentCenter;
+        [bgImaegView addSubview:_couponCodeLab];
+        [_couponCodeLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.bottom.mas_equalTo(-16);
+            make.centerX.equalTo(bgImaegView.mas_centerX).offset(-25);
+            make.width.mas_equalTo((KScreenWidth - 50)/2 - 80);
+        }];
+        
         
     }
     return self;

+ 39 - 4
Asteria/Fuction/Goods/V/ASGoodsDetailsTableView.m

@@ -16,6 +16,10 @@
 #import "ASGoodsGuaranteeInfoCell.h"
 #import "ASGoodsReviewHeadCell.h"
 #import "GoodsReviewsCell.h"
+#import "ASGoodsReviewFootCell.h"
+#import "KWMineMoreProductsCell.h"
+
+#import "KWMineMoreProductModel.h"
 
 @interface ASGoodsDetailsTableView()
 
@@ -75,14 +79,15 @@
     } else if ([typeStr isEqualToString:@"size"]) {
         ASGoodsDetailsSizeCell *cell = [ASGoodsDetailsSizeCell cellWithTableView:tableView CellClass:[ASGoodsDetailsSizeCell class]];
         
-        [cell configData:(GoodsInformationM *)objectM];
-        
         @weakify(self)
         cell.currencyparameterClose = ^(NSInteger type, id Data) {
             @strongify(self)
             [self generaltriggermethodType:type data:Data];
         };
         
+        
+        [cell configData:(GoodsInformationM *)objectM];
+        
         return  cell;
     } else if ([typeStr isEqualToString:@"guarantee"]) {
         ASGoodsGuaranteeInfoCell *cell = [ASGoodsGuaranteeInfoCell cellWithTableView:tableView CellClass:[ASGoodsGuaranteeInfoCell class]];
@@ -98,7 +103,7 @@
         return  cell;
     } else if ([typeStr isEqualToString:@"reviewHead"]) {
         ASGoodsReviewHeadCell *cell = [ASGoodsReviewHeadCell cellWithTableView:tableView CellClass:[ASGoodsReviewHeadCell class]];
-        
+        cell.clipsToBounds = YES;
         [cell configData:(GoodsInformationM *)objectM];
         
         @weakify(self)
@@ -111,6 +116,7 @@
     } else if ([objectM isKindOfClass:[GoodsReviewsListM class]]) {
 //        GoodsReviewsListM *objectM =  self.infodata[indexPath.row];
         GoodsReviewsCell *cell = [GoodsReviewsCell cellWithTableView:tableView CellClass:[GoodsReviewsCell class]];
+        cell.clipsToBounds = YES;
         [cell configData:objectM];
         @weakify(self)
         cell.currencyparameterClose = ^(NSInteger type, id Data) {
@@ -118,8 +124,37 @@
             
         };
         return cell;
+    } else if ([typeStr isEqualToString:@"reviewFoot"]) {
+        //        GoodsReviewsListM *objectM =  self.infodata[indexPath.row];
+        ASGoodsReviewFootCell *cell = [ASGoodsReviewFootCell cellWithTableView:tableView CellClass:[ASGoodsReviewFootCell class]];
+        cell.clipsToBounds = YES;
+        @weakify(self)
+        cell.currencyparameterClose = ^(NSInteger type, id Data) {
+            @strongify(self)
+            [self generaltriggermethodType:type data:Data];
+        };
+        return cell;
+    } else if ([typeStr isEqualToString:@"customer"]) {
+        KWMineMoreProductModel *model =  (KWMineMoreProductModel *)objectM;
+//        KWMineMoreProductsCell *cell = [tableView dequeueReusableCellWithIdentifier:@"KWMineMoreProductsCell" forIndexPath:indexPath];
+        KWMineMoreProductsCell *cell = [[KWMineMoreProductsCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"KWMineMoreProductsCell"];
+        
+        cell.topSpace = 20;
+//        KWMineMoreProductModel * model = [KWMineMoreProductModel demoData];
+        [cell setData: model];
+        @weakify(self);
+        [cell setProductClick:^(NSInteger i, ASProductBaseModel *m) {
+    //        if (![weak_self checkLogin:true]) {
+    //            return;
+    //        }
+           // 点击推荐商品
+    //        [weak_self goto_WKM_GoodsDetailsC:m.Id];
+        }];
+        return cell;
     }
     
+    
+    
     return  nil;
     
 }
@@ -137,7 +172,7 @@
         objectM = dataM;
     }
     
-    if (([typeStr isEqualToString:@"reviewHead"] || [objectM isKindOfClass:[GoodsReviewsListM class]]) && !self.isReview) {
+    if (([typeStr isEqualToString:@"reviewHead"] || [objectM isKindOfClass:[GoodsReviewsListM class]] || [typeStr isEqualToString:@"reviewFoot"] || [typeStr isEqualToString:@"customer"]) && !self.isReview) {
         return 0;
     }
     

+ 0 - 7
Asteria/Fuction/Goods/V/ASGoodsGuaranteeInfoCell.m

@@ -75,13 +75,6 @@
             self.rightBtn = radBtn;
         }
     }
-//    RadioButton *firstBtn = self.radioBtnAry[0];
-//    [firstBtn setGroupButtons:self.radioBtnAry];
-//    [self.radioBtnAry[0] setSelected:YES];
-//    [self xxx_onRadioButtonValueChanged:self.radioBtnAry[0]];
-    
-    
-//    self.datails_payV.titleLab.text = [NSString stringWithFormat:@"Pay in 4 interest-free payments of %@%.2f with",model.currency_symbol,[model.final_prices floatValue]/4];
 
 }
 

+ 16 - 0
Asteria/Fuction/Goods/V/ASGoodsReviewFootCell.h

@@ -0,0 +1,16 @@
+//
+//  ASGoodsReviewFootCell.h
+//  Asteria
+//
+//  Created by xingyu on 2024/5/25.
+//
+
+#import <WMBase/WMBase.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ASGoodsReviewFootCell : TT_BaseCell
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 52 - 0
Asteria/Fuction/Goods/V/ASGoodsReviewFootCell.m

@@ -0,0 +1,52 @@
+//
+//  ASGoodsReviewFootCell.m
+//  Asteria
+//
+//  Created by xingyu on 2024/5/25.
+//
+
+#import "ASGoodsReviewFootCell.h"
+
+@interface ASGoodsReviewFootCell()
+
+
+@end
+
+@implementation ASGoodsReviewFootCell
+
+- (void)setupSubviewS {
+//    UIView *backView = [[UIView alloc] init];
+//    [self.contentView addSubview:backView];
+//    [backView mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.left.mas_equalTo(10);
+//        make.top.mas_equalTo(10);
+//        make.right.mas_equalTo(-10);
+////            make.height.mas_equalTo(45);
+//        make.bottom.mas_equalTo(0);
+//    }];
+    
+    UIButton *viewMoreBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    viewMoreBtn.titleLabel.font = [UIFont fontWithName:Rob_Regular size:16];
+    [viewMoreBtn setTitle:@"VIEW MORE" forState:UIControlStateNormal];
+    [viewMoreBtn setTitleColor:Col_000 forState:UIControlStateNormal];
+    viewMoreBtn.backgroundColor = Col_FFF;
+    [viewMoreBtn addTarget:self action:@selector(_btnClick) forControlEvents:UIControlEventTouchUpInside];
+    TT_ViewBorderRadius(viewMoreBtn, 4, 1, Col_000);
+    [self.contentView addSubview:viewMoreBtn];
+    [viewMoreBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(10);
+        make.height.mas_equalTo(36);
+        make.width.mas_equalTo(200);
+        make.centerX.mas_equalTo(self.contentView);
+        make.bottom.mas_equalTo(-20);
+    }];
+    
+}
+
+- (void)_btnClick {
+    if (self.currencyparameterClose) {
+        self.currencyparameterClose(5, nil);
+    }
+}
+
+@end

+ 22 - 3
Asteria/Fuction/Goods/VC/ASGoodsDetailsViewController.m

@@ -18,6 +18,7 @@
 
 #import "GoodsInformationM.h"
 #import "GoodsReviewsListM.h"
+#import "KWMineMoreProductModel.h"
 
 
 
@@ -77,7 +78,7 @@
     K_WEAK_SELF;
     self.TableV.tapClose = ^(NSInteger num, id data) {
         K_STRONG_SELF;
-        if (num == 1) {//查看评论
+        if (num == 1 || num == 5) {//查看评论
             [self action_GoodsReviewsListC];
         } else if (num == 2) {//商品web详情
             self.isReview = NO;
@@ -107,6 +108,19 @@
 }
 
 -(void)reqNet_Size_rewriteCartAddProducts {
+        
+    if (!AS_Dict_valid(self.sizeParam)) {
+        NSMutableDictionary *optionDic = [NSMutableDictionary dictionary];
+        for (OptionsModel *optionM in self.model.options) {
+            OptionsValuesM *valuesM = optionM.values[optionM.optionSelectTag];
+            NSString *tempStr =[NSString stringWithFormat:@"options[%@]",optionM.option_id];
+            optionDic[tempStr] =valuesM.option_type_id;
+        }
+        NSMutableDictionary *sizeDic = [NSMutableDictionary dictionaryWithDictionary:optionDic];
+        sizeDic[@"qty"] = [NSString stringWithFormat:@"%@", @"1"];
+        self.sizeParam = sizeDic;
+    }
+    
     NSMutableDictionary *params = [NSMutableDictionary dictionaryWithDictionary:self.sizeParam];
     params[@"product"] =  self.model.Id;
     NSLog(@"=====%@", params);
@@ -187,13 +201,18 @@
     //保障信息
     NSDictionary *guarantee = @{@"type":@"guarantee", @"data":self.model};
     [self.TableV.infodata addObject:guarantee];
-    
     //评论头
     NSDictionary *reviewHead = @{@"type":@"reviewHead", @"data":self.model};
     [self.TableV.infodata addObject:reviewHead];
-    
     //评论数据
     [self.TableV.infodata addObjectsFromArray:self.reviewDataArray];
+    //评论底部
+    NSDictionary *reviewFoot = @{@"type":@"reviewFoot", @"data":self.model};
+    [self.TableV.infodata addObject:reviewFoot];
+    //推荐商品
+    KWMineMoreProductModel *model = [KWMineMoreProductModel demoData];
+    NSDictionary *customer = @{@"type":@"customer", @"data":model};
+    [self.TableV.infodata addObject:customer];
     
 //    if (self.isReview) {
 //        

+ 7 - 2
Asteria/Fuction/UserCenter/Orders/Controller/ASOrderDetailsViewController.m

@@ -32,7 +32,12 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    self.titleStr = @"Orders inf";
+    if (self.isPay) {
+        self.titleStr = @"Orders Information";
+    } else {
+        self.titleStr = @"Payment";
+    }
+    
     self.statusBgV.backgroundColor = Col_FFF;
     self.customNavBar.backgroundColor = Col_FFF;
     
@@ -113,7 +118,7 @@
     if (self.isPay) {
         ASPayFinishHeadView *payFailedView = [[ASPayFinishHeadView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 100) status:1 desc:self.orderId];
         
-        K_WEAK_SELF;
+//        K_WEAK_SELF;
         payFailedView.clickBlock = ^(int type) {
     //        K_STRONG_SELF;
         };

+ 26 - 0
Asteria/Fuction/UserCenter/Orders/View/ASOrderDetailsItemsCell.m

@@ -16,6 +16,7 @@
 @property (nonatomic, strong) UILabel *priceLab;
 @property (nonatomic, strong) UILabel *optLab;
 
+@property (nonatomic, strong) UILabel *giftLab;
 
 @end
 
@@ -86,6 +87,17 @@
             make.right.mas_equalTo(-10);
             make.left.mas_equalTo(10);
         }];
+        
+        _giftLab = [UILabel labelCreateWithText:@"Gift" font:[UIFont fontWithName:Rob_Regular size:12] textColor:Col_000];
+        _giftLab.textAlignment = NSTextAlignmentCenter;
+        _giftLab.backgroundColor = _F0FFF9;
+        [backView addSubview:_giftLab];
+        [_giftLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.equalTo(self.nameLab);
+            make.bottom.equalTo(self.goodsImage);
+            make.width.equalTo(@64);
+            make.height.equalTo(@23);
+        }];
     }
     return self;
 }
@@ -96,6 +108,20 @@
     NSString *imageAllStr = [NSString stringWithFormat:@"https:%@%@%@",HostPath,ProductImgPath,AS_String_NotNull(_itemModel.image)];
     [self.goodsImage sd_setImageWithURL:[NSURL URLWithString:imageAllStr] placeholderImage:UIImageDefaultImg_SD];
     
+    NSString *nameStr = AS_String_NotNull(_itemModel.name);
+    
+    if([nameStr hasPrefix:@"FREE"]){
+        _giftLab.hidden = NO;
+        _countLab.hidden = YES;
+        _realPriceLab.hidden = YES;
+        _priceLab.hidden = YES;
+    }else{
+        _giftLab.hidden = YES;
+        _countLab.hidden = NO;
+        _realPriceLab.hidden = NO;
+        _priceLab.hidden = NO;
+    }
+    
     _nameLab.text = AS_String_NotNull(_itemModel.name);
     _countLab.text = [NSString stringWithFormat:@"X%@", AS_String_NotNull(_itemModel.qty_ordered)];
     _realPriceLab.text = [NSString stringWithFormat:@"%@%@", AS_String_NotNull(_itemModel.currency_symbol), AS_String_NotNull(_itemModel.price)];

+ 2 - 2
Asteria/Fuction/UserCenter/Orders/View/ASPayFinishHeadView.m

@@ -171,11 +171,11 @@
         } else {
             _iconImage.image = [UIImage imageNamed:@"pay_success_icon"];
             _payStatusLab.text = @"Your Order Has Been Received";
-            _orderNumLab.text = @"Order #123";
+            _orderNumLab.text = [NSString stringWithFormat:@"Order #%@", desc];
             _descLab.text = @"Please try another card or refresh browser. Paypal gateway has rejected request. The buyer cannot pay with PayPal for this transaction(#13113: buyer cannot pay).";
             [_topBtn setTitle:@"Continue Shopping" forState:UIControlStateNormal];
         }
-        
+            
         [self layoutIfNeeded];
         [_bottomBackView layoutIfNeeded];
         

+ 1 - 1
Asteria/NetTools/ASNetTools.m

@@ -608,7 +608,7 @@
             id temp = [json mj_JSONObject];
             if ([temp isKindOfClass:[NSDictionary class]]) {
                 NSDictionary *result = (NSDictionary *)temp;
-                NSString *status = result[@"status"];
+                NSString *status = [NSString stringWithFormat:@"%@", result[@"status"]];
                 NSString *msg = result[@"msg"];
                 if (error.code == 401) {
                     [DataUtil setLoginToken:@""];

+ 8 - 2
Podfile

@@ -1,4 +1,4 @@
-platform :ios, '12.0'
+platform :ios, '13.0'
 
 
 
@@ -12,7 +12,7 @@ post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
       config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'No'
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
     end
     target.build_configurations.each do |config|
       if config.base_configuration_reference.is_a? Xcodeproj::Project::Object::PBXFileReference
@@ -24,6 +24,7 @@ post_install do |installer|
 end
 
 source 'https://github.com/CocoaPods/Specs.git'
+#source 'https://github.com/stripe/stripe-ios.git'
 
 
 target 'Asteria' do
@@ -66,6 +67,11 @@ pod 'FBSDKLoginKit' , '14.1.0'
   
   pod 'KlarnaMobileSDK'
   
+  pod 'Stripe', '~> 23.13.0'
+  pod 'StripePaymentSheet', '~> 23.13.0'
+  pod 'StripePaymentsUI'
+  pod 'StripeApplePay'
+  
 #  pod 'PayPal-iOS-SDK'
 
 pod 'OneSignalXCFramework', '>= 3.0.0', '< 4.0'

+ 44 - 1
Podfile.lock

@@ -1137,6 +1137,31 @@ PODS:
   - SDWebImage (5.15.8):
     - SDWebImage/Core (= 5.15.8)
   - SDWebImage/Core (5.15.8)
+  - Stripe (23.13.0):
+    - StripeApplePay (= 23.13.0)
+    - StripeCore (= 23.13.0)
+    - StripePayments (= 23.13.0)
+    - StripePaymentsUI (= 23.13.0)
+    - StripeUICore (= 23.13.0)
+  - StripeApplePay (23.13.0):
+    - StripeCore (= 23.13.0)
+  - StripeCore (23.13.0)
+  - StripePayments (23.13.0):
+    - StripeCore (= 23.13.0)
+    - StripePayments/Stripe3DS2 (= 23.13.0)
+  - StripePayments/Stripe3DS2 (23.13.0):
+    - StripeCore (= 23.13.0)
+  - StripePaymentSheet (23.13.0):
+    - StripeApplePay (= 23.13.0)
+    - StripeCore (= 23.13.0)
+    - StripePayments (= 23.13.0)
+    - StripePaymentsUI (= 23.13.0)
+  - StripePaymentsUI (23.13.0):
+    - StripeCore (= 23.13.0)
+    - StripePayments (= 23.13.0)
+    - StripeUICore (= 23.13.0)
+  - StripeUICore (23.13.0):
+    - StripeCore (= 23.13.0)
   - Toast (4.0.0)
   - WMBase (1.0.9):
     - AFNetworking
@@ -1180,6 +1205,10 @@ DEPENDENCIES:
   - PPBadgeView
   - Reachability
   - SDWebImage
+  - Stripe (~> 23.13.0)
+  - StripeApplePay
+  - StripePaymentSheet (~> 23.13.0)
+  - StripePaymentsUI
   - Toast
   - WMBase (from `../WMBase`)
 
@@ -1229,6 +1258,13 @@ SPEC REPOS:
     - QMUIKit
     - Reachability
     - SDWebImage
+    - Stripe
+    - StripeApplePay
+    - StripeCore
+    - StripePayments
+    - StripePaymentSheet
+    - StripePaymentsUI
+    - StripeUICore
     - Toast
     - YTKNetwork
     - YYCache
@@ -1282,11 +1318,18 @@ SPEC CHECKSUMS:
   QMUIKit: 6321cf1124623d686a9ec0a79a7cc59d0d64a52c
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SDWebImage: cb032eba469c54e0000e78bcb0a13cdde0a52798
+  Stripe: ee21be55cfcd4b4797486b1afaeb0d822d7ae8fd
+  StripeApplePay: 70a263e288bcf4e2011cf4027a2fc0813a6f8c09
+  StripeCore: 0f01d8c435d94b9e6bf937006a6144544e580c90
+  StripePayments: 47e26bb98818fbdc331cec8cb11a03c08f47305b
+  StripePaymentSheet: ca5ba76d1957a18077a5d83bff8b2aaf3f772973
+  StripePaymentsUI: 58029c55b661c176c8d2e406393fff9eb46bb8ce
+  StripeUICore: 171fcf535c658ee1ebd7aaf08fa6a0eceb3fb3db
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   WMBase: 10acc948841d8b2d220fcc117ae3ea4cf0acfcbc
   YTKNetwork: c16be90b06be003de9e9cd0d3b187cc8eaf35c04
   YYCache: 8105b6638f5e849296c71f331ff83891a4942952
 
-PODFILE CHECKSUM: 5fd883e6c0c9f40cbbefd8bf9f456a6bcaa463a1
+PODFILE CHECKSUM: db424bd8ab0c93f84419da3cc8f72101a02e7842
 
 COCOAPODS: 1.15.2

+ 44 - 1
Pods/Manifest.lock

@@ -1137,6 +1137,31 @@ PODS:
   - SDWebImage (5.15.8):
     - SDWebImage/Core (= 5.15.8)
   - SDWebImage/Core (5.15.8)
+  - Stripe (23.13.0):
+    - StripeApplePay (= 23.13.0)
+    - StripeCore (= 23.13.0)
+    - StripePayments (= 23.13.0)
+    - StripePaymentsUI (= 23.13.0)
+    - StripeUICore (= 23.13.0)
+  - StripeApplePay (23.13.0):
+    - StripeCore (= 23.13.0)
+  - StripeCore (23.13.0)
+  - StripePayments (23.13.0):
+    - StripeCore (= 23.13.0)
+    - StripePayments/Stripe3DS2 (= 23.13.0)
+  - StripePayments/Stripe3DS2 (23.13.0):
+    - StripeCore (= 23.13.0)
+  - StripePaymentSheet (23.13.0):
+    - StripeApplePay (= 23.13.0)
+    - StripeCore (= 23.13.0)
+    - StripePayments (= 23.13.0)
+    - StripePaymentsUI (= 23.13.0)
+  - StripePaymentsUI (23.13.0):
+    - StripeCore (= 23.13.0)
+    - StripePayments (= 23.13.0)
+    - StripeUICore (= 23.13.0)
+  - StripeUICore (23.13.0):
+    - StripeCore (= 23.13.0)
   - Toast (4.0.0)
   - WMBase (1.0.9):
     - AFNetworking
@@ -1180,6 +1205,10 @@ DEPENDENCIES:
   - PPBadgeView
   - Reachability
   - SDWebImage
+  - Stripe (~> 23.13.0)
+  - StripeApplePay
+  - StripePaymentSheet (~> 23.13.0)
+  - StripePaymentsUI
   - Toast
   - WMBase (from `../WMBase`)
 
@@ -1229,6 +1258,13 @@ SPEC REPOS:
     - QMUIKit
     - Reachability
     - SDWebImage
+    - Stripe
+    - StripeApplePay
+    - StripeCore
+    - StripePayments
+    - StripePaymentSheet
+    - StripePaymentsUI
+    - StripeUICore
     - Toast
     - YTKNetwork
     - YYCache
@@ -1282,11 +1318,18 @@ SPEC CHECKSUMS:
   QMUIKit: 6321cf1124623d686a9ec0a79a7cc59d0d64a52c
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SDWebImage: cb032eba469c54e0000e78bcb0a13cdde0a52798
+  Stripe: ee21be55cfcd4b4797486b1afaeb0d822d7ae8fd
+  StripeApplePay: 70a263e288bcf4e2011cf4027a2fc0813a6f8c09
+  StripeCore: 0f01d8c435d94b9e6bf937006a6144544e580c90
+  StripePayments: 47e26bb98818fbdc331cec8cb11a03c08f47305b
+  StripePaymentSheet: ca5ba76d1957a18077a5d83bff8b2aaf3f772973
+  StripePaymentsUI: 58029c55b661c176c8d2e406393fff9eb46bb8ce
+  StripeUICore: 171fcf535c658ee1ebd7aaf08fa6a0eceb3fb3db
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   WMBase: 10acc948841d8b2d220fcc117ae3ea4cf0acfcbc
   YTKNetwork: c16be90b06be003de9e9cd0d3b187cc8eaf35c04
   YYCache: 8105b6638f5e849296c71f331ff83891a4942952
 
-PODFILE CHECKSUM: 5fd883e6c0c9f40cbbefd8bf9f456a6bcaa463a1
+PODFILE CHECKSUM: db424bd8ab0c93f84419da3cc8f72101a02e7842
 
 COCOAPODS: 1.15.2

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 34983 - 27609
Pods/Pods.xcodeproj/project.pbxproj


+ 175 - 0
Pods/Target Support Files/Pods-Asteria-NotificationServiceExtension/Pods-Asteria-NotificationServiceExtension-acknowledgements.markdown

@@ -3410,6 +3410,181 @@ THE SOFTWARE.
 
 
 
+## Stripe
+
+The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+## StripeApplePay
+
+The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+## StripeCore
+
+The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+## StripePaymentSheet
+
+The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+## StripePayments
+
+The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+## StripePaymentsUI
+
+The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+## StripeUICore
+
+The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
 ## Toast
 
 Copyright (c) 2011-2017 Charles Scalesse.

+ 217 - 0
Pods/Target Support Files/Pods-Asteria-NotificationServiceExtension/Pods-Asteria-NotificationServiceExtension-acknowledgements.plist

@@ -3655,6 +3655,223 @@ THE SOFTWARE.
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>Stripe</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>StripeApplePay</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>StripeCore</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>StripePaymentSheet</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>StripePayments</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>StripePaymentsUI</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>StripeUICore</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>Copyright (c) 2011-2017 Charles Scalesse.

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 3 - 3
Pods/Target Support Files/Pods-Asteria-NotificationServiceExtension/Pods-Asteria-NotificationServiceExtension.debug.xcconfig


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 3 - 3
Pods/Target Support Files/Pods-Asteria-NotificationServiceExtension/Pods-Asteria-NotificationServiceExtension.release.xcconfig


+ 175 - 0
Pods/Target Support Files/Pods-Asteria/Pods-Asteria-acknowledgements.markdown

@@ -3410,6 +3410,181 @@ THE SOFTWARE.
 
 
 
+## Stripe
+
+The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+## StripeApplePay
+
+The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+## StripeCore
+
+The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+## StripePaymentSheet
+
+The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+## StripePayments
+
+The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+## StripePaymentsUI
+
+The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+## StripeUICore
+
+The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
 ## Toast
 
 Copyright (c) 2011-2017 Charles Scalesse.

+ 217 - 0
Pods/Target Support Files/Pods-Asteria/Pods-Asteria-acknowledgements.plist

@@ -3655,6 +3655,223 @@ THE SOFTWARE.
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>Stripe</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>StripeApplePay</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>StripeCore</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>StripePaymentSheet</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>StripePayments</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>StripePaymentsUI</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>StripeUICore</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>Copyright (c) 2011-2017 Charles Scalesse.

+ 7 - 0
Pods/Target Support Files/Pods-Asteria/Pods-Asteria-frameworks-Debug-input-files.xcfilelist

@@ -28,6 +28,13 @@ ${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework
 ${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework
 ${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework
 ${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework
+${BUILT_PRODUCTS_DIR}/Stripe/Stripe.framework
+${BUILT_PRODUCTS_DIR}/StripeApplePay/StripeApplePay.framework
+${BUILT_PRODUCTS_DIR}/StripeCore/StripeCore.framework
+${BUILT_PRODUCTS_DIR}/StripePaymentSheet/StripePaymentSheet.framework
+${BUILT_PRODUCTS_DIR}/StripePayments/StripePayments.framework
+${BUILT_PRODUCTS_DIR}/StripePaymentsUI/StripePaymentsUI.framework
+${BUILT_PRODUCTS_DIR}/StripeUICore/StripeUICore.framework
 ${BUILT_PRODUCTS_DIR}/Toast/Toast.framework
 ${BUILT_PRODUCTS_DIR}/WMBase/WMBase.framework
 ${BUILT_PRODUCTS_DIR}/YTKNetwork/YTKNetwork.framework

+ 7 - 0
Pods/Target Support Files/Pods-Asteria/Pods-Asteria-frameworks-Debug-output-files.xcfilelist

@@ -27,6 +27,13 @@ ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Stripe.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StripeApplePay.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StripeCore.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StripePaymentSheet.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StripePayments.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StripePaymentsUI.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StripeUICore.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WMBase.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YTKNetwork.framework

+ 7 - 0
Pods/Target Support Files/Pods-Asteria/Pods-Asteria-frameworks-Release-input-files.xcfilelist

@@ -27,6 +27,13 @@ ${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework
 ${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework
 ${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework
 ${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework
+${BUILT_PRODUCTS_DIR}/Stripe/Stripe.framework
+${BUILT_PRODUCTS_DIR}/StripeApplePay/StripeApplePay.framework
+${BUILT_PRODUCTS_DIR}/StripeCore/StripeCore.framework
+${BUILT_PRODUCTS_DIR}/StripePaymentSheet/StripePaymentSheet.framework
+${BUILT_PRODUCTS_DIR}/StripePayments/StripePayments.framework
+${BUILT_PRODUCTS_DIR}/StripePaymentsUI/StripePaymentsUI.framework
+${BUILT_PRODUCTS_DIR}/StripeUICore/StripeUICore.framework
 ${BUILT_PRODUCTS_DIR}/Toast/Toast.framework
 ${BUILT_PRODUCTS_DIR}/WMBase/WMBase.framework
 ${BUILT_PRODUCTS_DIR}/YTKNetwork/YTKNetwork.framework

+ 7 - 0
Pods/Target Support Files/Pods-Asteria/Pods-Asteria-frameworks-Release-output-files.xcfilelist

@@ -26,6 +26,13 @@ ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Stripe.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StripeApplePay.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StripeCore.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StripePaymentSheet.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StripePayments.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StripePaymentsUI.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StripeUICore.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WMBase.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YTKNetwork.framework

+ 14 - 0
Pods/Target Support Files/Pods-Asteria/Pods-Asteria-frameworks.sh

@@ -205,6 +205,13 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/Stripe/Stripe.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/StripeApplePay/StripeApplePay.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/StripeCore/StripeCore.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/StripePaymentSheet/StripePaymentSheet.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/StripePayments/StripePayments.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/StripePaymentsUI/StripePaymentsUI.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/StripeUICore/StripeUICore.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/Toast/Toast.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/WMBase/WMBase.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/YTKNetwork/YTKNetwork.framework"
@@ -253,6 +260,13 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/Stripe/Stripe.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/StripeApplePay/StripeApplePay.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/StripeCore/StripeCore.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/StripePaymentSheet/StripePaymentSheet.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/StripePayments/StripePayments.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/StripePaymentsUI/StripePaymentsUI.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/StripeUICore/StripeUICore.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/Toast/Toast.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/WMBase/WMBase.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/YTKNetwork/YTKNetwork.framework"

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 4 - 4
Pods/Target Support Files/Pods-Asteria/Pods-Asteria.debug.xcconfig


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 4 - 4
Pods/Target Support Files/Pods-Asteria/Pods-Asteria.release.xcconfig