New purchase flow buy course

Stepic/Images.xcassets/CourseInfoPurchaseModal/Contents.json

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

Stepic/Images.xcassets/CourseInfoPurchaseModal/CourseInfoPurchaseModalPurchaseFail.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "CourseInfoPurchaseModalPurchaseFail.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Stepic/Images.xcassets/CourseInfoPurchaseModal/CourseInfoPurchaseModalPurchaseFailExclamationMark.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "CourseInfoPurchaseModalPurchaseFailExclamationMark.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Stepic/Images.xcassets/CourseInfoPurchaseModal/CourseInfoPurchaseModalPurchaseSuccess.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "CourseInfoPurchaseModalPurchaseSuccess.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Stepic/Info-Develop.plist

@@ -62,7 +62,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>390</string>
+	<string>391</string>
 	<key>FacebookAppID</key>
 	<string>171127739724012</string>
 	<key>FacebookDisplayName</key>

Stepic/Info-Production.plist

@@ -62,7 +62,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>390</string>
+	<string>391</string>
 	<key>FacebookAppID</key>
 	<string>171127739724012</string>
 	<key>FacebookDisplayName</key>

Stepic/Info-Release.plist

@@ -62,7 +62,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>390</string>
+	<string>391</string>
 	<key>FacebookAppID</key>
 	<string>171127739724012</string>
 	<key>FacebookDisplayName</key>

Stepic/Legacy/Model/Entities/Course/Course+CoreDataProperties.swift

@@ -134,7 +134,7 @@ extension Course {
         }
     }
 
-    var reviewSummaryId: Int? {
+    var reviewSummaryID: Int? {
         get {
             managedReviewSummaryId?.intValue
         }
@@ -215,7 +215,7 @@ extension Course {
         }
     }
 
-    var progressId: String? {
+    var progressID: String? {
         get {
             managedProgressId
         }
@@ -233,7 +233,7 @@ extension Course {
         }
     }
 
-    var lastStepId: String? {
+    var lastStepID: String? {
         set(id) {
             self.managedLastStepId = id
         }

Stepic/Legacy/Model/Entities/Course/Course.swift

@@ -127,12 +127,12 @@ final class Course: NSManagedObject, ManagedObject, IDFetchable {
         self.audience = json[JSONKey.targetAudience.rawValue].stringValue
         self.requirements = json[JSONKey.requirements.rawValue].stringValue
         self.slug = json[JSONKey.slug.rawValue].string
-        self.progressId = json[JSONKey.progress.rawValue].string
-        self.lastStepId = json[JSONKey.lastStep.rawValue].string
+        self.progressID = json[JSONKey.progress.rawValue].string
+        self.lastStepID = json[JSONKey.lastStep.rawValue].string
         self.scheduleType = json[JSONKey.scheduleType.rawValue].string
         self.learnersCount = json[JSONKey.learnersCount.rawValue].int
         self.totalUnits = json[JSONKey.totalUnits.rawValue].intValue
-        self.reviewSummaryId = json[JSONKey.reviewSummary.rawValue].int
+        self.reviewSummaryID = json[JSONKey.reviewSummary.rawValue].int
         self.sectionsArray = json[JSONKey.sections.rawValue].arrayObject as! [Int]
         self.instructorsArray = json[JSONKey.instructors.rawValue].arrayObject as! [Int]
         self.authorsArray = json[JSONKey.authors.rawValue].arrayObject as? [Int] ?? []

Stepic/Legacy/Model/PlainObjects/CoursePayment.swift

@@ -14,6 +14,7 @@ final class CoursePayment: JSONSerializable {
     var isPaid = false
     var data: Data?
     var paymentProviderStringValue: String = PaymentProvider.apple.rawValue
+    var promoCode: String?
 
     var status: Status? {
         Status(rawValue: self.statusStringValue)
@@ -35,13 +36,23 @@ final class CoursePayment: JSONSerializable {
             dict[JSONKey.data.rawValue] = JSON(data)
         }
 
+        if let promoCode = self.promoCode {
+            dict[JSONKey.promoCode.rawValue] = JSON(promoCode)
+        }
+
         return dict
     }
 
-    init(courseID: Course.IdType, data: Data, paymentProvider: PaymentProvider = .apple) {
+    init(
+        courseID: Course.IdType,
+        data: Data,
+        paymentProvider: PaymentProvider = .apple,
+        promoCode: String?
+    ) {
         self.courseID = courseID
         self.data = data
         self.paymentProviderStringValue = paymentProvider.rawValue
+        self.promoCode = promoCode
     }
 
     init(json: JSON) {
@@ -58,6 +69,7 @@ final class CoursePayment: JSONSerializable {
         self.isPaid = json[JSONKey.isPaid.rawValue].boolValue
         self.data = json[JSONKey.data.rawValue].dictionaryObject
         self.paymentProviderStringValue = json[JSONKey.paymentProvider.rawValue].stringValue
+        self.promoCode = json[JSONKey.promoCode.rawValue].string
     }
 
     enum Status: String {
@@ -99,6 +111,7 @@ final class CoursePayment: JSONSerializable {
         case isPaid = "is_paid"
         case data = "data"
         case paymentProvider = "payment_provider"
+        case promoCode = "promo_code"
     }
 }
 
@@ -113,7 +126,8 @@ extension CoursePayment: CustomStringConvertible {
         statusStringValue: \(self.statusStringValue), \
         isPaid: \(self.isPaid), \
         data: \(String(describing: self.data)), \
-        paymentProviderStringValue: \(self.paymentProviderStringValue))
+        paymentProviderStringValue: \(self.paymentProviderStringValue), \
+        promoCode: \(String(describing: self.promoCode)))
         """
     }
 }

Stepic/Legacy/Model/RemoteConfig/RemoteConfig.swift

@@ -12,6 +12,15 @@ final class RemoteConfig {
 
     private static let defaultCoursePurchaseFlowType = CoursePurchaseFlowType.web
 
+    private static let defaultPurchaseFlowDisclaimerRussian = """
+В цену включена комиссия App Store и НДС. Оплачивая доступ к этому курсу вы соглашаетесь с условиями \
+<a href=\"https://welcome.stepik.org/ru/payment-terms\">пользовательского соглашения</a>.
+"""
+    private static let defaultPurchaseFlowDisclaimerEnglish = """
+The price includes commission from App Store and VAT. By paying for access to this course you agree to the \
+<a href=\"https://welcome.stepik.org/en/payment-terms\">user agreement</a>.
+"""
+
     static let shared = RemoteConfig(delegate: DebugRemoteConfig.shared)
 
     weak var delegate: RemoteConfigDelegate?
@@ -30,7 +39,9 @@ final class RemoteConfig {
         Key.searchResultsQueryParams.rawValue: NSDictionary(dictionary: ["is_popular": "true", "is_public": "true"]),
         Key.isCoursePricesEnabled.rawValue: NSNumber(value: false),
         Key.isCourseRevenueAvailable.rawValue: NSNumber(value: false),
-        Key.purchaseFlow.rawValue: NSString(string: Self.defaultCoursePurchaseFlowType.rawValue)
+        Key.purchaseFlow.rawValue: NSString(string: Self.defaultCoursePurchaseFlowType.rawValue),
+        Key.purchaseFlowDisclaimerRussian.rawValue: NSString(string: Self.defaultPurchaseFlowDisclaimerRussian),
+        Key.purchaseFlowDisclaimerEnglish.rawValue: NSString(string: Self.defaultPurchaseFlowDisclaimerEnglish)
     ]
 
     var showStreaksNotificationTrigger: ShowStreaksNotificationTrigger {
@@ -100,6 +111,16 @@ final class RemoteConfig {
         return Self.defaultCoursePurchaseFlowType
     }
 
+    var purchaseFlowDisclaimer: String {
+        if Locale.current.languageCode == "ru" {
+            return self.getStringValueFromDelegateOrRemoteConfigForKey(.purchaseFlowDisclaimerRussian)
+                ?? Self.defaultPurchaseFlowDisclaimerRussian
+        } else {
+            return self.getStringValueFromDelegateOrRemoteConfigForKey(.purchaseFlowDisclaimerEnglish)
+                ?? Self.defaultPurchaseFlowDisclaimerEnglish
+        }
+    }
+
     init(delegate: RemoteConfigDelegate? = nil) {
         self.delegate = delegate
 
@@ -212,6 +233,8 @@ final class RemoteConfig {
         case isCoursePricesEnabled = "is_course_prices_enabled_ios"
         case isCourseRevenueAvailable = "is_course_revenue_available_ios"
         case purchaseFlow = "purchase_flow_ios"
+        case purchaseFlowDisclaimerRussian = "purchase_flow_ios_disclaimer_ru"
+        case purchaseFlowDisclaimerEnglish = "purchase_flow_ios_disclaimer_en"
 
         var valueDataType: ValueDataType {
             switch self {
@@ -231,6 +254,8 @@ final class RemoteConfig {
                 return .string
             case .purchaseFlow:
                 return .string
+            case .purchaseFlowDisclaimerRussian, .purchaseFlowDisclaimerEnglish:
+                return .string
             }
         }
 

Stepic/Legacy/Services/CourseSubscriber.swift

@@ -49,7 +49,7 @@ final class CourseSubscriber: CourseSubscriberProtocol {
     ) -> Promise<Course> {
         Promise<Course> { seal in
             _ = ApiDataDownloader.enrollments.joinCourse(course, delete: unsubscribe, success: { [weak self] in
-                guard let progressID = course.progressId else {
+                guard let progressID = course.progressID else {
                     seal.reject(CourseSubscriptionError.badResponseFormat)
                     return
                 }

Stepic/Legacy/TransitionRouters/LastStepRouter.swift

@@ -50,7 +50,7 @@ final class LastStepRouter {
         }
 
         guard course.canContinue,
-              let lastStepID = course.lastStepId else {
+              let lastStepID = course.lastStepID else {
             return self.fallbackToSyllabus(
                 courseID: course.id,
                 courseViewSource: viewSource,

Stepic/Sources/Controllers/ContactSupportController.swift

@@ -3,13 +3,17 @@ import SVProgressHUD
 import UIKit
 
 final class ContactSupportController: NSObject {
+    private let subject: String
+
     private weak var presentationController: UIViewController?
     private let userAccountService: UserAccountServiceProtocol
 
     init(
+        subject: String = NSLocalizedString("ContactSupportSubject", comment: ""),
         presentationController: UIViewController,
-        userAccountService: UserAccountServiceProtocol
+        userAccountService: UserAccountServiceProtocol = UserAccountService()
     ) {
+        self.subject = subject
         self.presentationController = presentationController
         self.userAccountService = userAccountService
     }
@@ -23,7 +27,7 @@ final class ContactSupportController: NSObject {
         mailComposeViewController.mailComposeDelegate = self
 
         mailComposeViewController.setToRecipients(["support@stepik.org"])
-        mailComposeViewController.setSubject(NSLocalizedString("ContactSupportSubject", comment: ""))
+        mailComposeViewController.setSubject(self.subject)
         mailComposeViewController.setMessageBody(self.makeMessageBody(), isHTML: false)
 
         self.presentationController?.present(mailComposeViewController, animated: true)

Stepic/Sources/Controllers/PanModalPresentableViewController.swift

@@ -19,8 +19,32 @@ class PanModalPresentableViewController: UIViewController, PanModalPresentable {
         return .contentHeight(scrollView.contentSize.height)
     }
 
+    var cornerRadius: CGFloat { 8.0 }
+
+    var springDamping: CGFloat { 0.8 }
+
+    var transitionAnimationOptions: UIView.AnimationOptions {
+        [.curveEaseInOut, .allowUserInteraction, .beginFromCurrentState]
+    }
+
+    var panModalBackgroundColor: UIColor { .black.withAlphaComponent(0.7) }
+
+    var dragIndicatorBackgroundColor: UIColor { .lightGray }
+
     var anchorModalToLongForm: Bool { false }
 
+    var allowsDragToDismiss: Bool { true }
+
+    var allowsTapToDismiss: Bool { true }
+
+    var isUserInteractionEnabled: Bool { true }
+
+    var isHapticFeedbackEnabled: Bool { true }
+
+    var shouldRoundTopCorners: Bool { self.isPanModalPresented }
+
+    var showDragIndicator: Bool { self.shouldRoundTopCorners }
+
     var isShortFormEnabled = true
 
     var currentPresentationState: PanModalPresentationController.PresentationState?
@@ -50,6 +74,14 @@ class PanModalPresentableViewController: UIViewController, PanModalPresentable {
         )
     }
 
+    func shouldRespond(to panModalGestureRecognizer: UIPanGestureRecognizer) -> Bool { true }
+
+    func willRespond(to panModalGestureRecognizer: UIPanGestureRecognizer) {}
+
+    func shouldTransition(to state: PanModalPresentationController.PresentationState) -> Bool { true }
+
+    func shouldPrioritize(panModalGestureRecognizer: UIPanGestureRecognizer) -> Bool { false }
+
     func willTransition(to state: PanModalPresentationController.PresentationState) {
         self.currentPresentationState = state
 
@@ -62,6 +94,10 @@ class PanModalPresentableViewController: UIViewController, PanModalPresentable {
         self.panModalSetNeedsLayoutUpdate()
     }
 
+    func panModalWillDismiss() {}
+
+    func panModalDidDismiss() {}
+
     private func updateAdditionalSafeAreaInsets() {
         self.additionalSafeAreaInsets = UIApplication.shared.delegate?.window??.safeAreaInsets ?? .zero
     }