Merge pull request #21 from epegasus/master

Billing (subscription + inapp)
hypersoftdev · May 12, 2023 · 5d41b57 · 5d41b57
2 parents e338bdf + 6beb63a
commit 5d41b57
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/billing/src/main/java/com/hypersoft/billing/constants/SubscriptionProductIds.kt b/billing/src/main/java/com/hypersoft/billing/constants/SubscriptionProductIds.kt
@@ -14,7 +14,7 @@ object SubscriptionProductIds {
  const val basicProductFourWeeks = "basic_product_four_weeks"
  const val basicProductMonthly = "basic_product_monthly"
  const val basicProductQuarterly = "basic_product_quarterly"
- const val basicProductSemiYearly = "basic_product_semi-yearly"
+ const val basicProductSemiYearly = "basic_product_semi_yearly"
  const val basicProductYearly = "basic_product_yearly"
  const val basicProductLifeTime = "basic_product_lifetime"
 

diff --git a/billing/src/main/java/com/hypersoft/billing/helper/BillingHelper.kt b/billing/src/main/java/com/hypersoft/billing/helper/BillingHelper.kt
@@ -20,6 +20,7 @@ import com.android.billingclient.api.QueryProductDetailsParams
 import com.android.billingclient.api.QueryPurchasesParams
 import com.android.billingclient.api.queryProductDetails
 import com.hypersoft.billing.constants.SubscriptionPlans
+import com.hypersoft.billing.constants.SubscriptionProductIds
 import com.hypersoft.billing.dataProvider.DataProviderInApp
 import com.hypersoft.billing.dataProvider.DataProviderSub
 import com.hypersoft.billing.enums.BillingState
@@ -364,22 +365,22 @@ abstract class BillingHelper(private val context: Context) {
  var prodDetails: ProductDetails? = null
 
  dataProviderSub.getProductDetailsList().forEach { productDetails ->
- if (productDetails.productId == SubscriptionPlans.basicPlanWeekly && subscriptionPlans == SubscriptionPlans.basicPlanWeekly) {
+ if (productDetails.productId == SubscriptionProductIds.basicProductWeekly && subscriptionPlans == SubscriptionPlans.basicPlanWeekly) {
  prodDetails = productDetails
  return@forEach
- } else if (productDetails.productId == SubscriptionPlans.basicPlanFourWeeks && subscriptionPlans == SubscriptionPlans.basicPlanFourWeeks) {
+ } else if (productDetails.productId == SubscriptionProductIds.basicProductFourWeeks && subscriptionPlans == SubscriptionPlans.basicPlanFourWeeks) {
  prodDetails = productDetails
  return@forEach
- } else if (productDetails.productId == SubscriptionPlans.basicPlanMonthly && subscriptionPlans == SubscriptionPlans.basicPlanMonthly) {
+ } else if (productDetails.productId == SubscriptionProductIds.basicProductMonthly && subscriptionPlans == SubscriptionPlans.basicPlanMonthly) {
  prodDetails = productDetails
  return@forEach
- } else if (productDetails.productId == SubscriptionPlans.basicPlanQuarterly && subscriptionPlans == SubscriptionPlans.basicPlanQuarterly) {
+ } else if (productDetails.productId == SubscriptionProductIds.basicProductQuarterly && subscriptionPlans == SubscriptionPlans.basicPlanQuarterly) {
  prodDetails = productDetails
  return@forEach
- } else if (productDetails.productId == SubscriptionPlans.basicPlanSemiYearly && subscriptionPlans == SubscriptionPlans.basicPlanSemiYearly) {
+ } else if (productDetails.productId == SubscriptionProductIds.basicProductSemiYearly && subscriptionPlans == SubscriptionPlans.basicPlanSemiYearly) {
  prodDetails = productDetails
  return@forEach
- } else if (productDetails.productId == SubscriptionPlans.basicPlanYearly && subscriptionPlans == SubscriptionPlans.basicPlanYearly) {
+ } else if (productDetails.productId == SubscriptionProductIds.basicProductYearly && subscriptionPlans == SubscriptionPlans.basicPlanYearly) {
  prodDetails = productDetails
  return@forEach
  }