Explorar el Código

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

Abel hace 1 año
padre
commit
211a99b9bf
Se han modificado 36 ficheros con 28733 adiciones y 27292 borrados
  1. 12 6
      Asteria.xcodeproj/project.pbxproj
  2. 2 0
      Asteria/ASUI/SimpleBase/ASBaseViewController.h
  3. 6 0
      Asteria/Fuction/Cart/Cart.xcassets/Cart/Contents.json
  4. 22 0
      Asteria/Fuction/Cart/Cart.xcassets/Cart/cart_no_data.imageset/Contents.json
  5. BIN
      Asteria/Fuction/Cart/Cart.xcassets/Cart/cart_no_data.imageset/cart_no_data@2x.png
  6. BIN
      Asteria/Fuction/Cart/Cart.xcassets/Cart/cart_no_data.imageset/cart_no_data@3x.png
  7. 64 11
      Asteria/Fuction/Cart/Cart_CheckoutC.m
  8. 84 31
      Asteria/Fuction/Cart/Cart_MyCartC.m
  9. 35 0
      Asteria/Fuction/Cart/PayManager/ASCheckoutPayManager.h
  10. 205 0
      Asteria/Fuction/Cart/PayManager/ASCheckoutPayManager.m
  11. 0 19
      Asteria/Fuction/Cart/PayManager/ASPaypalManager.h
  12. 0 54
      Asteria/Fuction/Cart/PayManager/ASPaypalManager.m
  13. 16 0
      Asteria/Fuction/Cart/V/ASMyCartNoDataView.h
  14. 83 0
      Asteria/Fuction/Cart/V/ASMyCartNoDataView.m
  15. 3 0
      Asteria/Fuction/Cart/VM/CartVM.h
  16. 15 5
      Asteria/Fuction/Goods/V/ASGoodsDetailsTableView.m
  17. 3 7
      Asteria/Fuction/Goods/V/ASGoodsReviewHeadCell.m
  18. 39 19
      Asteria/Fuction/Goods/VC/ASGoodsDetailsViewController.m
  19. 8 0
      Asteria/Fuction/UserCenter/Orders/Controller/ASOrderDetailsViewController.m
  20. 2 0
      Podfile
  21. 7 1
      Podfile.lock
  22. 7 1
      Pods/Manifest.lock
  23. 27274 27130
      Pods/Pods.xcodeproj/project.pbxproj
  24. 205 0
      Pods/Target Support Files/Pods-Asteria-NotificationServiceExtension/Pods-Asteria-NotificationServiceExtension-acknowledgements.markdown
  25. 211 0
      Pods/Target Support Files/Pods-Asteria-NotificationServiceExtension/Pods-Asteria-NotificationServiceExtension-acknowledgements.plist
  26. 2 2
      Pods/Target Support Files/Pods-Asteria-NotificationServiceExtension/Pods-Asteria-NotificationServiceExtension.debug.xcconfig
  27. 2 2
      Pods/Target Support Files/Pods-Asteria-NotificationServiceExtension/Pods-Asteria-NotificationServiceExtension.release.xcconfig
  28. 205 0
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria-acknowledgements.markdown
  29. 211 0
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria-acknowledgements.plist
  30. 1 0
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria-frameworks-Debug-input-files.xcfilelist
  31. 1 0
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria-frameworks-Debug-output-files.xcfilelist
  32. 1 0
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria-frameworks-Release-input-files.xcfilelist
  33. 1 0
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria-frameworks-Release-output-files.xcfilelist
  34. 2 0
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria-frameworks.sh
  35. 2 2
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria.debug.xcconfig
  36. 2 2
      Pods/Target Support Files/Pods-Asteria/Pods-Asteria.release.xcconfig

+ 12 - 6
Asteria.xcodeproj/project.pbxproj

@@ -202,7 +202,7 @@
 		8810F5262BEDF9F900346FD4 /* ASCheckoutBottomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F5252BEDF9F900346FD4 /* ASCheckoutBottomView.m */; };
 		8810F5292BEE0DEA00346FD4 /* ASCheckoutGoodsItemCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F5282BEE0DEA00346FD4 /* ASCheckoutGoodsItemCell.m */; };
 		8810F52C2BF1A1CD00346FD4 /* ASAddGiftGoodsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F52B2BF1A1CD00346FD4 /* ASAddGiftGoodsView.m */; };
-		8810F5302BF3678400346FD4 /* ASPaypalManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F52F2BF3678400346FD4 /* ASPaypalManager.m */; };
+		8810F5302BF3678400346FD4 /* ASCheckoutPayManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F52F2BF3678400346FD4 /* ASCheckoutPayManager.m */; };
 		8810F53F2BF5949000346FD4 /* ASCommonUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F53E2BF5949000346FD4 /* ASCommonUtils.m */; };
 		8810F55E2BF5EBF400346FD4 /* ASOrderDetailsInfoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F5472BF5EBF400346FD4 /* ASOrderDetailsInfoCell.m */; };
 		8810F55F2BF5EBF400346FD4 /* ASOrderDetailsItemsCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F5492BF5EBF400346FD4 /* ASOrderDetailsItemsCell.m */; };
@@ -226,6 +226,7 @@
 		8810F5992BFB2B2400346FD4 /* ASGoodsGuaranteeInfoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8810F5982BFB2B2400346FD4 /* ASGoodsGuaranteeInfoCell.m */; };
 		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 */; };
 		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 */; };
@@ -751,8 +752,8 @@
 		8810F5282BEE0DEA00346FD4 /* ASCheckoutGoodsItemCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASCheckoutGoodsItemCell.m; sourceTree = "<group>"; };
 		8810F52A2BF1A1CD00346FD4 /* ASAddGiftGoodsView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASAddGiftGoodsView.h; sourceTree = "<group>"; };
 		8810F52B2BF1A1CD00346FD4 /* ASAddGiftGoodsView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASAddGiftGoodsView.m; sourceTree = "<group>"; };
-		8810F52E2BF3678400346FD4 /* ASPaypalManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASPaypalManager.h; sourceTree = "<group>"; };
-		8810F52F2BF3678400346FD4 /* ASPaypalManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASPaypalManager.m; sourceTree = "<group>"; };
+		8810F52E2BF3678400346FD4 /* ASCheckoutPayManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASCheckoutPayManager.h; sourceTree = "<group>"; };
+		8810F52F2BF3678400346FD4 /* ASCheckoutPayManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASCheckoutPayManager.m; sourceTree = "<group>"; };
 		8810F53D2BF5949000346FD4 /* ASCommonUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASCommonUtils.h; sourceTree = "<group>"; };
 		8810F53E2BF5949000346FD4 /* ASCommonUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASCommonUtils.m; sourceTree = "<group>"; };
 		8810F5462BF5EBF400346FD4 /* ASOrderDetailsInfoCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASOrderDetailsInfoCell.h; sourceTree = "<group>"; };
@@ -799,6 +800,8 @@
 		8810F59B2BFB3A4500346FD4 /* ASGoodsIntrouduceWebView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASGoodsIntrouduceWebView.m; sourceTree = "<group>"; };
 		8810F59D2BFC7D7600346FD4 /* ASGoodsReviewHeadCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASGoodsReviewHeadCell.h; sourceTree = "<group>"; };
 		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>"; };
 		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>"; };
@@ -1924,8 +1927,8 @@
 		8810F52D2BF3676900346FD4 /* PayManager */ = {
 			isa = PBXGroup;
 			children = (
-				8810F52E2BF3678400346FD4 /* ASPaypalManager.h */,
-				8810F52F2BF3678400346FD4 /* ASPaypalManager.m */,
+				8810F52E2BF3678400346FD4 /* ASCheckoutPayManager.h */,
+				8810F52F2BF3678400346FD4 /* ASCheckoutPayManager.m */,
 			);
 			path = PayManager;
 			sourceTree = "<group>";
@@ -2606,6 +2609,8 @@
 				9A2415BD2B678A1000A6E903 /* QtyCountV.m */,
 				9AEFA7DC2B649F3F00AE1974 /* MyCarlTableV.h */,
 				9AEFA7DD2B649F3F00AE1974 /* MyCarlTableV.m */,
+				8810F5A02BFF448C00346FD4 /* ASMyCartNoDataView.h */,
+				8810F5A12BFF448C00346FD4 /* ASMyCartNoDataView.m */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -2936,7 +2941,7 @@
 				9A3F5CAB2B3BBEAB00DDB6A7 /* GoodsDetailsPayV.m in Sources */,
 				81C796242A4FD63A003083B8 /* ASVipCouponsViewController.m in Sources */,
 				9AEFA7DE2B649F4000AE1974 /* MyCarlTableV.m in Sources */,
-				8810F5302BF3678400346FD4 /* ASPaypalManager.m in Sources */,
+				8810F5302BF3678400346FD4 /* ASCheckoutPayManager.m in Sources */,
 				8810F53F2BF5949000346FD4 /* ASCommonUtils.m in Sources */,
 				9AFCDAC22B809C5B003D3573 /* CartCheckTableV.m in Sources */,
 				9AC2CC222B3A673B005187BD /* ASGoodsDetailsVM.m in Sources */,
@@ -3128,6 +3133,7 @@
 				9AD364C62A05E73E00452C7A /* AS_GoodsDetailsC.m in Sources */,
 				8120211E2B15F2B30026B8B5 /* ASVipUrlTempModel.m in Sources */,
 				8193D5CE2BEA2B8E00B9AB11 /* ASAddressViewModel.m in Sources */,
+				8810F5A22BFF448C00346FD4 /* ASMyCartNoDataView.m in Sources */,
 				9A35203A2B479BAA00D097CB /* YJLAttributesLabel.m in Sources */,
 				816020102A2EE55F00E4A8F1 /* ASCategaryListCell.m in Sources */,
 				8810F55E2BF5EBF400346FD4 /* ASOrderDetailsInfoCell.m in Sources */,

+ 2 - 0
Asteria/ASUI/SimpleBase/ASBaseViewController.h

@@ -48,6 +48,8 @@ NS_ASSUME_NONNULL_BEGIN
 -(void)goto_WKM_GoodsDetailsC:(NSString *)entity_id;
 -(void)action_GoodsSizeC:(NSString *)entity_id;
 
+- (void)backAction;
+
 @end
 
 NS_ASSUME_NONNULL_END

+ 6 - 0
Asteria/Fuction/Cart/Cart.xcassets/Cart/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 22 - 0
Asteria/Fuction/Cart/Cart.xcassets/Cart/cart_no_data.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "cart_no_data@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "cart_no_data@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
Asteria/Fuction/Cart/Cart.xcassets/Cart/cart_no_data.imageset/cart_no_data@2x.png


BIN
Asteria/Fuction/Cart/Cart.xcassets/Cart/cart_no_data.imageset/cart_no_data@3x.png


+ 64 - 11
Asteria/Fuction/Cart/Cart_CheckoutC.m

@@ -21,6 +21,8 @@
 
 #import "ASAddGiftGoodsView.h"
 
+#import "ASCheckoutPayManager.h"
+
 
 @interface Cart_CheckoutC ()<RY_baseVMprotocol>
 
@@ -272,7 +274,17 @@
             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{
@@ -470,23 +482,64 @@
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     [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];
+    K_WEAK_SELF;
+    [ASCheckoutPayManager sharedInstance].payFinishBlock = ^(NSString * _Nonnull payMethod, NSUInteger isSucess, id  _Nonnull payData) {
+        K_STRONG_SELF;
+        NSLog(@"payData======%@", payData);
+        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"]];
+            });
+            
+        } else {
+            
+            [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 paymentResultStatus:@""];
+            });
+            
+        }
+    };
+    return;
+    
     if ([paymentCode isEqualToString:@"paypal_express"]) {//paypal
         
-        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;
+        
+//        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
         
@@ -500,7 +553,7 @@
     
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     NSDictionary *param = @{@"method":paymentCode};
-    K_WEAK_SELF;
+//    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];

+ 84 - 31
Asteria/Fuction/Cart/Cart_MyCartC.m

@@ -13,6 +13,7 @@
 #import "ASGoodsDetailsVM.h"
 
 #import "ASAddGiftGoodsView.h"
+#import "ASMyCartNoDataView.h"
 
 #import "ASGoodsDetailsViewController.h"
 
@@ -37,6 +38,9 @@
 @property (nonatomic, assign) int index;
 @property (nonatomic, assign) int giftShowCount;
 
+//空页面
+@property (nonatomic, strong) ASMyCartNoDataView *noDataView;
+
 @end
 
 @implementation Cart_MyCartC
@@ -52,6 +56,9 @@
 }
 - (void)initSubviews {
     [super initSubviews];
+    
+    self.view.backgroundColor = [UIColor colorWithHexString:@"#F8F8F8"];
+    
     [self.view addSubview:self.topBgV];
     [self.topBgV addSubview:self.top_totalLab];
     [self.topBgV addSubview:self.top_priceLab];
@@ -66,6 +73,8 @@
         make.centerY.equalTo(self.topBgV);
     }];
     
+    
+    
     IPhoneXHeigh
     [self setupTableV:[MyCarlTableV class] Frame:CGRectMake(0, CGRectGetMaxY(self.topBgV.frame), KScreenWidth, KScreenHeight-securityBottom_H - 65- CGRectGetMaxY(self.topBgV.frame)-self.postBtn.mj_h)];
     self.TableV.backgroundColor = [UIColor colorWithHexString:@"#F8F8F8"];
@@ -76,6 +85,10 @@
     self.addGiftParamArr = [[NSMutableArray alloc] initWithCapacity:1];
     self.index = 0;
     self.giftShowCount = 0;
+    
+    self.topBgV.hidden = YES;
+    self.postBtn.hidden = YES;
+    self.TableV.hidden = YES;
 }
 
 
@@ -103,7 +116,7 @@
                 [self reqNet_DEL_cartsMineCoupons];
             }
         } else if ([data isKindOfClass:[MyCartGrandTotalCellData class]]){
-            MyCartGrandTotalCellData *totalData = (MyCartGrandTotalCellData *)data;
+//            MyCartGrandTotalCellData *totalData = (MyCartGrandTotalCellData *)data;
             
             [self requestLostExtraFee:num];
         }
@@ -208,45 +221,75 @@
     [MBProgressHUD hideHUDForView:self.view animated:YES];
     if([mark isEqualToString:Cart_cartsMineTotals]){
         if(sucessOrFail){
-            CartTotalsM *model = [arry firstObject];
-            self.totalsM = model;
-            self.top_totalLab.text = [NSString stringWithFormat:@"%@ pcs | total",model.items_qty];
-            self.top_priceLab.text =[NSString stringWithFormat:@"%@%@",model.currency_symbol,model.subtotal];
-            [self.TableV.infodata removeAllObjects];
-            self.TableV.infodata = [NSMutableArray arrayWithArray:model.items];
             
-            self.couponCellM.couponAry =[NSMutableArray arrayWithArray: [ASNetTools shared].xxx_couponAry];
-            self.couponCellM.coupon_code = model.coupon_code;
-            self.couponCellM.discount_amount = model.discount_amount;
-            self.couponCellM.currency_symbol = model.currency_symbol;
-            [self.TableV.infodata addObject:self.couponCellM];
             
-            self.totalCellM.total_segments = [NSMutableArray arrayWithArray:model.total_segments];
-            self.totalCellM.currency_symbol = model.currency_symbol;
-            [self.TableV.infodata addObject:self.totalCellM];
             
-            MyCartPayTypeCellData *data = [[MyCartPayTypeCellData alloc]init];
-            data.final_prices_f = [model.subtotal floatValue];
-            data.currency_symbol = model.currency_symbol;
-            [self.TableV.infodata addObject:data];
             
-            //手动添加赠品功能
-            [self.addGiftParamArr removeAllObjects];
             
-            NSDictionary *freeData = (NSDictionary *)[[self.totalsM.extension_attributes objectForKey:@"free_data"] mj_JSONObject];
-            BOOL is_show = [[freeData objectForKey:@"is_show"] boolValue];
-            if (is_show && self.giftShowCount< 1) {//显示存在赠品
-                NSArray *productArr = [freeData objectForKey:@"products"];
-                if (productArr.count > 0) { //存在赠品
-                    for (int i = 0; i < productArr.count; i++) {
-                        NSDictionary *productDic = productArr[i];
-                        NSString *entity_id = productDic[@"entity_id"];
-                        [self reqNet_GoodsDetails_productGetProduct:entity_id];
+            CartTotalsM *model = [arry firstObject];
+            self.totalsM = model;
+            
+            if (AS_Array_valid(self.totalsM.items)) {
+                //空页面
+                self.noDataView.hidden = YES;
+                self.TableV.hidden = NO;
+                self.topBgV.hidden = NO;
+                self.postBtn.hidden = NO;
+                
+                self.top_totalLab.text = [NSString stringWithFormat:@"%@ pcs | total",model.items_qty];
+                self.top_priceLab.text =[NSString stringWithFormat:@"%@%@",model.currency_symbol,model.subtotal];
+                [self.TableV.infodata removeAllObjects];
+                self.TableV.infodata = [NSMutableArray arrayWithArray:model.items];
+                
+                self.couponCellM.couponAry =[NSMutableArray arrayWithArray: [ASNetTools shared].xxx_couponAry];
+                self.couponCellM.coupon_code = model.coupon_code;
+                self.couponCellM.discount_amount = model.discount_amount;
+                self.couponCellM.currency_symbol = model.currency_symbol;
+                [self.TableV.infodata addObject:self.couponCellM];
+                
+                self.totalCellM.total_segments = [NSMutableArray arrayWithArray:model.total_segments];
+                self.totalCellM.currency_symbol = model.currency_symbol;
+                [self.TableV.infodata addObject:self.totalCellM];
+                
+                MyCartPayTypeCellData *data = [[MyCartPayTypeCellData alloc]init];
+                data.final_prices_f = [model.subtotal floatValue];
+                data.currency_symbol = model.currency_symbol;
+                [self.TableV.infodata addObject:data];
+                
+                //手动添加赠品功能
+                [self.addGiftParamArr removeAllObjects];
+                
+                NSDictionary *freeData = (NSDictionary *)[[self.totalsM.extension_attributes objectForKey:@"free_data"] mj_JSONObject];
+                BOOL is_show = [[freeData objectForKey:@"is_show"] boolValue];
+                if (is_show && self.giftShowCount< 1) {//显示存在赠品
+                    NSArray *productArr = [freeData objectForKey:@"products"];
+                    if (productArr.count > 0) { //存在赠品
+                        for (int i = 0; i < productArr.count; i++) {
+                            NSDictionary *productDic = productArr[i];
+                            NSString *entity_id = productDic[@"entity_id"];
+                            [self reqNet_GoodsDetails_productGetProduct:entity_id];
+                        }
                     }
                 }
+                
+                [self.TableV reloadData];
+                
+                
+            } else {
+                //空页面
+                self.noDataView.hidden = NO;
+                self.TableV.hidden = YES;
+                self.topBgV.hidden = YES;
+                self.postBtn.hidden = YES;
             }
             
-            [self.TableV reloadData];
+        } else {
+            //空页面
+            self.noDataView.hidden = NO;
+            self.TableV.hidden = YES;
+            self.topBgV.hidden = YES;
+            self.postBtn.hidden = YES;
+            
         }
     }else if ([mark isEqualToString:Cart_cartsMineItems_Post]
               || [mark isEqualToString:DEL_cartsMineItems]
@@ -393,4 +436,14 @@
     return _addGiftView;
 }
 
+- (ASMyCartNoDataView *)noDataView {
+    if (!_noDataView) {
+        IPhoneXHeigh
+        _noDataView = [[ASMyCartNoDataView alloc] initWithFrame:CGRectMake(0, securitytop_Y, KScreenWidth, KScreenHeight - securitytop_Y - securityBottom_H)];
+        _noDataView.hidden = YES;
+        [self.view addSubview:_noDataView];
+    }
+    return _noDataView;
+}
+
 @end

+ 35 - 0
Asteria/Fuction/Cart/PayManager/ASCheckoutPayManager.h

@@ -0,0 +1,35 @@
+//
+//  ASCheckoutPayManager.h
+//  Asteria
+//
+//  Created by xingyu on 2024/5/14.
+//
+
+#import <Foundation/Foundation.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 Chectout_Pay_Paypal_Url      BaseRequestrUrl(@"rewrite/paypal/getPaypalToken")
+#define Chectout_Pay_Klarna_Url      BaseRequestrUrl(@"rewrite/klarna/getKlarnaToken")
+
+
+typedef void(^ASPayFinishBlock)(NSString *payMethod, NSUInteger isSucess , id payData);
+
+@interface ASCheckoutPayManager : NSObject
+
+@property (nonatomic, copy) ASPayFinishBlock payFinishBlock;
+
++ (instancetype)sharedInstance;
+
+- (void)checkoutPayWithMethodType:(NSString *)payType;
+
+- (void)checkoutPayWithMethodType:(NSString *)payType completion:(void (^ __nullable)(NSUInteger isSucess , id payData))completion;
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 205 - 0
Asteria/Fuction/Cart/PayManager/ASCheckoutPayManager.m

@@ -0,0 +1,205 @@
+//
+//  ASCheckoutPayManager.m
+//  Asteria
+//
+//  Created by xingyu on 2024/5/14.
+//
+
+#import "ASCheckoutPayManager.h"
+#import <KlarnaMobileSDK/KlarnaMobileSDK-Swift.h>
+
+@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
+
+
+@implementation ASCheckoutPayManager
+
+static ASCheckoutPayManager *_instance = nil;
++ (instancetype)sharedInstance {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        _instance = [[ASCheckoutPayManager alloc] init];
+    });
+    
+    return _instance;
+}
+
+- (void)checkoutPayWithMethodType:(NSString *)payType {
+    
+    self.payType = payType;
+    
+    UIViewController *topVC = topViewController();
+    
+    if ([payType isEqualToString:@"paypal_express"]) {//paypal
+        K_WEAK_SELF;
+        [MBProgressHUD showHUDAddedTo:topVC.view animated:YES];
+        [ASNetTools.shared getWithPath:Chectout_Pay_Paypal_Url param:@{} success:^(id _Nonnull json) {
+            K_STRONG_SELF;
+            [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+            
+            NSDictionary *dataDic = (NSDictionary *)json;
+            NSString *urlStr = AS_String_NotNull(dataDic[@"url"]);
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self tool_gotoWebPay:urlStr withVC:topVC];
+            });
+            
+            NSLog(@"=====%@", json);
+        } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+            K_STRONG_SELF;
+            [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+        }];
+        
+    } else if ([payType isEqualToString:@"stripe_payments"]) {//visa
+        
+    } else if ([payType isEqualToString:@"afterpay_payment"]) {//afterpay
+        
+    } else if ([payType isEqualToString:@"klarna_kco"]) {//klarna
+                
+        K_WEAK_SELF;
+        [MBProgressHUD showHUDAddedTo:topVC.view animated:YES];
+        [ASNetTools.shared getWithPath:Chectout_Pay_Klarna_Url param:@{} success:^(id _Nonnull json) {
+            K_STRONG_SELF;
+            [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+            
+            NSDictionary *dataDic = (NSDictionary *)json;
+            self.client_token = AS_String_NotNull(dataDic[@"client_token"]);
+            //klarna_1 初始化 如果不经历接口创建订单,永远无法更新 client_token 的订单信息
+            [self.klarna_payV initializeWithClientToken:self.client_token returnUrl:[NSURL URLWithString:@"alipearlKlarna://"]];
+            
+            NSLog(@"=====%@", json);
+        } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+            K_STRONG_SELF;
+            [MBProgressHUD hideHUDForView:topVC.view animated:YES];
+            
+        }];
+    } else {
+        
+    }
+}
+
+
+- (void)tool_gotoWebPay:(NSString *)urlStr withVC:(UIViewController *)tmpvc {
+    XXX_BaseWebC *vc = [[XXX_BaseWebC alloc] init];
+    vc.isPayType = YES;
+    vc.WebViewBlock = ^(NSUInteger status, id  _Nonnull webData) {
+        
+        if (self.payFinishBlock) {
+            self.payFinishBlock(self.payType, status, webData);
+        }
+    };
+    [vc xxx_dsWebLoadUrl:urlStr];
+    vc.modalPresentationStyle = UIModalPresentationFullScreen;
+    [tmpvc presentViewController:vc animated:YES completion:nil];
+}
+
+
+-(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]"];
+//    [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];
+//    }];
+}
+
+
+#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);
+    //klarna_2 加载试图
+    [paymentView loadWithJsonData:self.client_token];
+    //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);
+    
+    if (approved == true ){
+        NSLog(@"klarna 授权支付成功");
+//        if (self.payFinishBlock) {
+//            self.payFinishBlock(self.payType, 1, @{@"token":authToken});
+//        }
+//        self.author_token = authToken;
+//        [self tool_creatOrderAutoken:authToken];
+    } else {
+//        if (self.payFinishBlock) {
+//            self.payFinishBlock(self.payType, 0, @{@"token":authToken});
+//        }
+        NSLog(@"klarna 授权支付失败");
+    }
+}
+- (void)klarnaReauthorizedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView approved:(BOOL)approved authToken:(NSString * _Nullable)authToken {
+    NSLog(@"klarna---666---%@ approved authToken:(NSString * _Nullable)authToken",paymentView);
+    if (approved == true ){
+        [self tool_creatOrderAutoken:authToken];
+    }
+}
+- (void)klarnaResizedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView to:(CGFloat)newHeight {
+//    [self.klarna_payV mas_updateConstraints:^(MASConstraintMaker *make) {
+//        make.height.mas_equalTo(newHeight);
+//    }];
+}
+- (void)klarnaFailedInPaymentView:(KlarnaPaymentView * _Nonnull)paymentView withError:(KlarnaPaymentError * _Nonnull)error {
+    NSLog(@"klarna---777---%@",paymentView);
+}
+
+- (void)klarnaFinalizedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView approved:(BOOL)approved authToken:(NSString * _Nullable)authToken { 
+    
+}
+
+
+#pragma mark - **************** lazy ****************
+-(KlarnaPaymentView *)klarna_payV{
+    if(!_klarna_payV){
+        _klarna_payV = [[KlarnaPaymentView alloc] initWithCategory:@"pay_over_time" eventListener:self];
+        _klarna_payV.translatesAutoresizingMaskIntoConstraints = false;
+    }
+    return _klarna_payV;
+}
+
+@end

+ 0 - 19
Asteria/Fuction/Cart/PayManager/ASPaypalManager.h

@@ -1,19 +0,0 @@
-//
-//  ASPaypalManager.h
-//  Asteria
-//
-//  Created by xingyu on 2024/5/14.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ASPaypalManager : NSObject
-
-
-- (void)checkoutPayWithMethodType:(NSString *)payType completion:(void (^ __nullable)(NSUInteger isSucess , id payData))completion;
-
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 54
Asteria/Fuction/Cart/PayManager/ASPaypalManager.m

@@ -1,54 +0,0 @@
-//
-//  ASPaypalManager.m
-//  Asteria
-//
-//  Created by xingyu on 2024/5/14.
-//
-
-#import "ASPaypalManager.h"
-
-
-@implementation ASPaypalManager
-
-
-- (void)checkoutPayWithMethodType:(NSString *)payType completion:(void (^ __nullable)(NSUInteger isSucess , id payData))completion {
-    if ([payType isEqualToString:@"paypal_express"]) {//paypal
-        K_WEAK_SELF;
-        [ASNetTools.shared postWithPath:postTakeExtraPoints param:@{@"type": @"123"} success:^(id _Nonnull json) {
-            
-        } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
-            
-        }];
-        
-    } else if ([payType isEqualToString:@"stripe_payments"]) {//visa
-        
-    } else if ([payType isEqualToString:@"afterpay_payment"]) {//afterpay
-        
-    } else if ([payType isEqualToString:@"klarna_kco"]) {//klarna
-        
-    } else {
-        
-    }
-}
-
-
-- (void)tool_gotoWebPay:(NSString *)urlStr withVC:(UIViewController *)tmpvc completion:(void (^ __nullable)(NSUInteger isSucess , id payData))completion{
-    XXX_BaseWebC *vc = [[XXX_BaseWebC alloc] init];
-    vc.isPayType = YES;
-    vc.WebViewBlock = ^(NSUInteger status, id  _Nonnull webData) {
-        if(status == 1){
-            if(completion){
-                completion(1, webData);
-            }
-        }else{
-            if(completion){
-                completion(0, webData);
-            }
-        }
-    };
-    [vc xxx_dsWebLoadUrl:urlStr];
-    vc.modalPresentationStyle = UIModalPresentationFullScreen;
-    [tmpvc presentViewController:vc animated:YES completion:nil];
-}
-
-@end

+ 16 - 0
Asteria/Fuction/Cart/V/ASMyCartNoDataView.h

@@ -0,0 +1,16 @@
+//
+//  ASMyCartNoDataView.h
+//  Asteria
+//
+//  Created by xingyu on 2024/5/23.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ASMyCartNoDataView : UIView
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 83 - 0
Asteria/Fuction/Cart/V/ASMyCartNoDataView.m

@@ -0,0 +1,83 @@
+//
+//  ASMyCartNoDataView.m
+//  Asteria
+//
+//  Created by xingyu on 2024/5/23.
+//
+
+#import "ASMyCartNoDataView.h"
+
+@interface ASMyCartNoDataView()
+
+@property (nonatomic, strong) UIView *emptyV;
+@property (nonatomic, strong) UIImageView *emptyImageView;
+
+@end
+
+@implementation ASMyCartNoDataView
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    if (self = [super initWithFrame:frame]) {
+        
+        
+        [self addSubview:self.emptyV];
+        [self.emptyV mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.edges.mas_equalTo(0);
+        }];
+        
+        _emptyImageView = [[UIImageView alloc] init];
+        _emptyImageView.contentMode = UIViewContentModeScaleAspectFit;
+        _emptyImageView.image = [UIImage imageNamed:@"cart_no_data"];
+        [self.emptyV addSubview:_emptyImageView];
+        [_emptyImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.centerX.equalTo(self.emptyV);
+            make.top.mas_equalTo(60);
+            make.width.height.mas_equalTo(KScreenWidth - 80);
+        }];
+        
+        K_WEAK_SELF;
+        dispatch_async(dispatch_get_main_queue(), ^{
+            K_STRONG_SELF;
+            [UIView viewAddHorColorBg:self.emptyV colorArr:@[
+                (id)_E0FFF5.CGColor,
+                (id)Col_FFF.CGColor
+            ] startP:CGPointMake(0.5, 0.25) endP:CGPointMake(0.5, 1)];
+            [self.emptyV bringSubviewToFront:self.emptyImageView];
+        });
+        
+        UIButton *clickBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        clickBtn.titleLabel.font = [UIFont fontWithName:Rob_Regular size:14];
+        [clickBtn setTitle:@"BACK TO PREVIOUS PAGE" forState:UIControlStateNormal];
+        clickBtn.backgroundColor = Col_000;
+        [clickBtn addTarget:self action:@selector(_btnClick) forControlEvents:UIControlEventTouchUpInside];
+        TT_ViewRadius(clickBtn, 4);
+        [clickBtn setTitleColor:Col_FFF forState:UIControlStateNormal];
+        [self addSubview:clickBtn];
+        [clickBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(_emptyImageView.mas_bottom).offset(48);
+            make.height.mas_equalTo(45);
+            make.left.mas_equalTo(40);
+            make.right.mas_equalTo(-40);
+            
+        }];
+        
+    }
+    return self;
+}
+
+- (void)_btnClick {
+    
+}
+
+- (UIView *)emptyV {
+    if (!_emptyV) {
+        UIView *v = [UIView baseV];
+        v.backgroundColor = Col_FFF;
+        _emptyV = v;
+    }
+    return _emptyV;
+}
+
+
+
+@end

+ 3 - 0
Asteria/Fuction/Cart/VM/CartVM.h

@@ -45,6 +45,9 @@
 //丢件险
 #define Chectout_lost_extrafee       @"rest/en/V1/amasty_extrafee/carts/mine/totals-information"
 
+//根据支付返回的token去服务端校验
+#define Chectout_Verify_PayToken     BaseRequestrUrl(@"rewrite/paypal/return")
+
 
 NS_ASSUME_NONNULL_BEGIN
 

+ 15 - 5
Asteria/Fuction/Goods/V/ASGoodsDetailsTableView.m

@@ -125,11 +125,21 @@
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
     
-//    NSObject *objectM = self.infodata[indexPath.row];
-//    if([objectM isKindOfClass:[CartTotalsItemsM class]] && self.isFlod){
-//        return 0;
-//    }
-//    return 1;
+    NSObject *dataM = self.infodata[indexPath.row];
+    
+    NSObject *objectM = nil;
+    NSString *typeStr = @"";
+    if ([dataM isKindOfClass:[NSDictionary class]]) {
+        NSDictionary *dataDic = (NSDictionary *)dataM;
+        objectM = [dataDic objectForKey:@"data"];
+        typeStr = [dataDic objectForKey:@"type"];
+    } else if ([dataM isKindOfClass:[GoodsReviewsListM class]]) {
+        objectM = dataM;
+    }
+    
+    if (([typeStr isEqualToString:@"reviewHead"] || [objectM isKindOfClass:[GoodsReviewsListM class]]) && !self.isReview) {
+        return 0;
+    }
     
     return UITableViewAutomaticDimension;
 }

+ 3 - 7
Asteria/Fuction/Goods/V/ASGoodsReviewHeadCell.m

@@ -41,13 +41,9 @@
         @weakify(self)
         _tableHeadV.ViewtapClose = ^(NSInteger num, id  _Nonnull data) {
             @strongify(self)
-//            if(num == 0){
-//                GoodsReviewsWriteC *vc = [[GoodsReviewsWriteC alloc]init];
-//                vc.goodsM = self.goodsM;
-//                vc.topBgV = self.topBgV;
-//                vc.nav_title = [NSString stringWithFormat:@"REVIEWS (%@)",self.goodsM.review_nums];
-//                [self.navigationController pushViewController:vc animated:YES];
-//            }
+            if (self.currencyparameterClose) {
+                self.currencyparameterClose(4, nil);
+            }
         };
     }
     return _tableHeadV;

+ 39 - 19
Asteria/Fuction/Goods/VC/ASGoodsDetailsViewController.m

@@ -8,6 +8,7 @@
 #import "ASGoodsDetailsViewController.h"
 #import "AS_GoodsReviewsListC.h"
 #import "Cart_CheckoutC.h"
+#import "GoodsReviewsWriteC.h"
 
 #import "ASGoodsDetailsVM.h"
 #import "ASGoodsDetailsTableView.h"
@@ -80,10 +81,22 @@
             [self action_GoodsReviewsListC];
         } else if (num == 2) {//商品web详情
             self.isReview = NO;
-            [self updateGoodsDetailsData];
-        } else if (num == 3) {//商品评论
+            self.TableV.isReview = NO;
+            self.TableV.tableFooterView = self.footView;
+            [self.TableV reloadData];
+//            [self updateGoodsDetailsData];
+        } else if (num == 3) {//商品评论列表
             self.isReview = YES;
-            [self updateGoodsDetailsData];
+            self.TableV.isReview = YES;
+            self.TableV.tableFooterView = nil;
+            [self.TableV reloadData];
+//            [self updateGoodsDetailsData];
+        } else if (num == 4) {//写商品评论
+            GoodsReviewsWriteC *vc = [[GoodsReviewsWriteC alloc]init];
+            vc.goodsM = self.model;
+//            vc.topBgV = self.topBgV;
+            vc.nav_title = [NSString stringWithFormat:@"REVIEWS (%@)",self.model.review_nums];
+            [self.navigationController pushViewController:vc animated:YES];
         } else if (num == 100) {
             self.sizeParam = (NSDictionary *)data;
         } else if (num == 1000) {
@@ -131,9 +144,11 @@
             self.model = model;
             self.title = model.name;
             
-            [self loadWebString];
             [self updateGoodsDetailsData];
-        } else if([mark isEqualToString:Size_rewriteCartAddProducts]) {            
+            
+            [self loadWebString];
+            
+        } else if([mark isEqualToString:Size_rewriteCartAddProducts]) {
             
             [self.view makeToast:@"Success" duration:2 position:CSToastPositionCenter title:nil image:nil style:nil completion:^(BOOL didTap) {
                 if (self.bottomClickType == 1) {
@@ -156,7 +171,7 @@
 
 - (void)updateGoodsDetailsData {
         
-    [self.TableV.infodata removeAllObjects];
+//    [self.TableV.infodata removeAllObjects];
     //商品图
     NSDictionary *banner = @{@"type":@"banner", @"data":self.model};
     [self.TableV.infodata addObject:banner];
@@ -173,19 +188,22 @@
     NSDictionary *guarantee = @{@"type":@"guarantee", @"data":self.model};
     [self.TableV.infodata addObject:guarantee];
     
-    if (self.isReview) {
-        //评论头
-        NSDictionary *reviewHead = @{@"type":@"reviewHead", @"data":self.model};
-        [self.TableV.infodata addObject:reviewHead];
-        
-        //评论数据
-        [self.TableV.infodata addObjectsFromArray:self.reviewDataArray];
-        
-        self.TableV.tableFooterView = nil;
-        
-    } else {
-        self.TableV.tableFooterView = _footView;
-    }
+    //评论头
+    NSDictionary *reviewHead = @{@"type":@"reviewHead", @"data":self.model};
+    [self.TableV.infodata addObject:reviewHead];
+    
+    //评论数据
+    [self.TableV.infodata addObjectsFromArray:self.reviewDataArray];
+    
+//    if (self.isReview) {
+//        
+//        
+//        self.TableV.tableFooterView = nil;
+//        
+//    } else {
+//        self.TableV.tableFooterView = _footView;
+//    }
+    
     
     [self.TableV reloadData];
 }
@@ -206,6 +224,8 @@
         self.footView.frame = CGRectMake(0, 0, KScreenWidth, webHeight);
         [self.TableV reloadData];
     };
+    
+    self.TableV.tableFooterView = _footView;
 }
 
 #pragma mark ---- Touch Event ----

+ 8 - 0
Asteria/Fuction/UserCenter/Orders/Controller/ASOrderDetailsViewController.m

@@ -126,6 +126,14 @@
     
 }
 
+- (void)backAction {
+    if (self.isPay) {
+        [self.navigationController popToRootViewControllerAnimated:YES];
+    } else {
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+}
+
 // MARK: - subvs
 - (UITableView *)tableView {
     if (!_tableView) {

+ 2 - 0
Podfile

@@ -64,6 +64,8 @@ pod 'FBSDKLoginKit' , '14.1.0'
   
   pod 'LookinServer', :configurations => ['Debug']
   
+  pod 'KlarnaMobileSDK'
+  
 #  pod 'PayPal-iOS-SDK'
 
 pod 'OneSignalXCFramework', '>= 3.0.0', '< 4.0'

+ 7 - 1
Podfile.lock

@@ -801,6 +801,9 @@ PODS:
   - GTMSessionFetcher/Core (3.1.1)
   - HCSStarRatingView (1.5)
   - IQKeyboardManager (6.5.11)
+  - KlarnaMobileSDK (2.6.20):
+    - KlarnaMobileSDK/basic (= 2.6.20)
+  - KlarnaMobileSDK/basic (2.6.20)
   - leveldb-library (1.22.2)
   - Libuv-gRPC (0.0.10):
     - Libuv-gRPC/Implementation (= 0.0.10)
@@ -1166,6 +1169,7 @@ DEPENDENCIES:
   - GoogleSignIn (= 7.0.0)
   - HCSStarRatingView (~> 1.5)
   - IQKeyboardManager
+  - KlarnaMobileSDK
   - LookinServer
   - Masonry
   - MBProgressHUD
@@ -1209,6 +1213,7 @@ SPEC REPOS:
     - GTMSessionFetcher
     - HCSStarRatingView
     - IQKeyboardManager
+    - KlarnaMobileSDK
     - leveldb-library
     - Libuv-gRPC
     - LookinServer
@@ -1261,6 +1266,7 @@ SPEC CHECKSUMS:
   GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72
   HCSStarRatingView: 1d18f79654735514cd6f00e6d90e38cb6320dc31
   IQKeyboardManager: ef43ce1ba1e5aaf4adf222c0a46f39761f246879
+  KlarnaMobileSDK: 61a07407178857a3c9bffd1ca4df95791d4f9eba
   leveldb-library: f03246171cce0484482ec291f88b6d563699ee06
   Libuv-gRPC: 55e51798e14ef436ad9bc45d12d43b77b49df378
   LookinServer: 1b2b61c6402ae29fa22182d48f5cd067b4e99e80
@@ -1281,6 +1287,6 @@ SPEC CHECKSUMS:
   YTKNetwork: c16be90b06be003de9e9cd0d3b187cc8eaf35c04
   YYCache: 8105b6638f5e849296c71f331ff83891a4942952
 
-PODFILE CHECKSUM: c582ecd47b74a707fa498f4a3e01d25ac335490c
+PODFILE CHECKSUM: 5fd883e6c0c9f40cbbefd8bf9f456a6bcaa463a1
 
 COCOAPODS: 1.15.2

+ 7 - 1
Pods/Manifest.lock

@@ -801,6 +801,9 @@ PODS:
   - GTMSessionFetcher/Core (3.1.1)
   - HCSStarRatingView (1.5)
   - IQKeyboardManager (6.5.11)
+  - KlarnaMobileSDK (2.6.20):
+    - KlarnaMobileSDK/basic (= 2.6.20)
+  - KlarnaMobileSDK/basic (2.6.20)
   - leveldb-library (1.22.2)
   - Libuv-gRPC (0.0.10):
     - Libuv-gRPC/Implementation (= 0.0.10)
@@ -1166,6 +1169,7 @@ DEPENDENCIES:
   - GoogleSignIn (= 7.0.0)
   - HCSStarRatingView (~> 1.5)
   - IQKeyboardManager
+  - KlarnaMobileSDK
   - LookinServer
   - Masonry
   - MBProgressHUD
@@ -1209,6 +1213,7 @@ SPEC REPOS:
     - GTMSessionFetcher
     - HCSStarRatingView
     - IQKeyboardManager
+    - KlarnaMobileSDK
     - leveldb-library
     - Libuv-gRPC
     - LookinServer
@@ -1261,6 +1266,7 @@ SPEC CHECKSUMS:
   GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72
   HCSStarRatingView: 1d18f79654735514cd6f00e6d90e38cb6320dc31
   IQKeyboardManager: ef43ce1ba1e5aaf4adf222c0a46f39761f246879
+  KlarnaMobileSDK: 61a07407178857a3c9bffd1ca4df95791d4f9eba
   leveldb-library: f03246171cce0484482ec291f88b6d563699ee06
   Libuv-gRPC: 55e51798e14ef436ad9bc45d12d43b77b49df378
   LookinServer: 1b2b61c6402ae29fa22182d48f5cd067b4e99e80
@@ -1281,6 +1287,6 @@ SPEC CHECKSUMS:
   YTKNetwork: c16be90b06be003de9e9cd0d3b187cc8eaf35c04
   YYCache: 8105b6638f5e849296c71f331ff83891a4942952
 
-PODFILE CHECKSUM: c582ecd47b74a707fa498f4a3e01d25ac335490c
+PODFILE CHECKSUM: 5fd883e6c0c9f40cbbefd8bf9f456a6bcaa463a1
 
 COCOAPODS: 1.15.2

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 27274 - 27130
Pods/Pods.xcodeproj/project.pbxproj


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

@@ -2648,6 +2648,211 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+## KlarnaMobileSDK
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018 Klarna Bank AB
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
 ## Libuv-gRPC
 
 libuv is licensed for use as follows:

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

@@ -2809,6 +2809,217 @@ SOFTWARE.
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018 Klarna Bank AB
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+</string>
+			<key>License</key>
+			<string>Apache License, Version 2.0</string>
+			<key>Title</key>
+			<string>KlarnaMobileSDK</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>libuv is licensed for use as follows:

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 2 - 2
Pods/Target Support Files/Pods-Asteria-NotificationServiceExtension/Pods-Asteria-NotificationServiceExtension.debug.xcconfig


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 2 - 2
Pods/Target Support Files/Pods-Asteria-NotificationServiceExtension/Pods-Asteria-NotificationServiceExtension.release.xcconfig


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

@@ -2648,6 +2648,211 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+## KlarnaMobileSDK
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018 Klarna Bank AB
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
 ## Libuv-gRPC
 
 libuv is licensed for use as follows:

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

@@ -2809,6 +2809,217 @@ SOFTWARE.
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018 Klarna Bank AB
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+</string>
+			<key>License</key>
+			<string>Apache License, Version 2.0</string>
+			<key>Title</key>
+			<string>KlarnaMobileSDK</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>libuv is licensed for use as follows:

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

@@ -41,6 +41,7 @@ ${PODS_XCFRAMEWORKS_BUILD_DIR}/FBAEMKit/FBAEMKit.framework/FBAEMKit
 ${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework/FBSDKCoreKit
 ${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit_Basics/FBSDKCoreKit_Basics.framework/FBSDKCoreKit_Basics
 ${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework/FBSDKLoginKit
+${PODS_XCFRAMEWORKS_BUILD_DIR}/KlarnaMobileSDK/basic/KlarnaMobileSDK.framework/KlarnaMobileSDK
 ${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignal.framework/OneSignal
 ${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalCore/OneSignalCore.framework/OneSignalCore
 ${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalExtension/OneSignalExtension.framework/OneSignalExtension

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

@@ -40,6 +40,7 @@ ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBAEMKit.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit_Basics.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKLoginKit.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KlarnaMobileSDK.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignal.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalCore.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalExtension.framework

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

@@ -40,6 +40,7 @@ ${PODS_XCFRAMEWORKS_BUILD_DIR}/FBAEMKit/FBAEMKit.framework/FBAEMKit
 ${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework/FBSDKCoreKit
 ${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit_Basics/FBSDKCoreKit_Basics.framework/FBSDKCoreKit_Basics
 ${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework/FBSDKLoginKit
+${PODS_XCFRAMEWORKS_BUILD_DIR}/KlarnaMobileSDK/basic/KlarnaMobileSDK.framework/KlarnaMobileSDK
 ${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignal.framework/OneSignal
 ${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalCore/OneSignalCore.framework/OneSignalCore
 ${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalExtension/OneSignalExtension.framework/OneSignalExtension

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

@@ -39,6 +39,7 @@ ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBAEMKit.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit_Basics.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKLoginKit.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KlarnaMobileSDK.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignal.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalCore.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalExtension.framework

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

@@ -218,6 +218,7 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then
   install_framework "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework"
   install_framework "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit_Basics/FBSDKCoreKit_Basics.framework"
   install_framework "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework"
+  install_framework "${PODS_XCFRAMEWORKS_BUILD_DIR}/KlarnaMobileSDK/basic/KlarnaMobileSDK.framework"
   install_framework "${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignal.framework"
   install_framework "${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalCore/OneSignalCore.framework"
   install_framework "${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalExtension/OneSignalExtension.framework"
@@ -265,6 +266,7 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
   install_framework "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework"
   install_framework "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit_Basics/FBSDKCoreKit_Basics.framework"
   install_framework "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework"
+  install_framework "${PODS_XCFRAMEWORKS_BUILD_DIR}/KlarnaMobileSDK/basic/KlarnaMobileSDK.framework"
   install_framework "${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignal.framework"
   install_framework "${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalCore/OneSignalCore.framework"
   install_framework "${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalExtension/OneSignalExtension.framework"

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 2 - 2
Pods/Target Support Files/Pods-Asteria/Pods-Asteria.debug.xcconfig


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 2 - 2
Pods/Target Support Files/Pods-Asteria/Pods-Asteria.release.xcconfig