bug fix

bug fix

bug fix

Author: Pooja-Zinrelo

Helper/Config.php

@@ -495,7 +495,19 @@ public function isRewardDropDownEnable()
      */
     public function isModuleEnabled()
     {
-        return $this->getConfig(self::XML_PATH_LOYALTY_REWARDS_ACTIVE) ? true : false;
+        if($this->getConfig(self::XML_PATH_LOYALTY_REWARDS_ACTIVE)) {
+            if(!$this->isAutoEnrollmentEnabled()) {
+                $customerId = $this->customerSession->create()->getCustomerId();
+                if ($customerId) {
+                    $zinreloOptedIn = $this->getOptInCustomAttributeValue($customerId);
+                    if (!$zinreloOptedIn) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        return false;
     }
 
     /**
@@ -700,7 +712,7 @@ public function getRedeemRules()
                                 "reward_id" => $rule["reward_id"],
                                 "id" => '',
                                 "reward_name" => $rule["reward_name"],
-                                "reward_value" => $rule["reward_value"],
+                                "reward_value" => !empty($rule["reward_value"]) ? $rule["reward_value"] : "",
                                 "maximum_redemption_limit" => !empty($rule["extra_parameters"]["maximum_redemption_limit"])
                                     ? $rule["extra_parameters"]["maximum_redemption_limit"] : "",
                                 "minimum_redemption_limit" => !empty($rule["extra_parameters"]["minimum_redemption_limit"])
@@ -727,6 +739,23 @@ public function getCustomerEmailBySession()
         return $this->customerSession->create()->getCustomer()->getEmail() ?? '';
     }
 
+    /**
+     * Get Customer Custom Attribute Value
+     *
+     * @return mixed
+     */
+    public function getOptInCustomAttributeValue($customerId)
+    {
+        $customerData = $this->customerRepository->getById($customerId);
+        $opt_in_attribute = $this->getOptInAttributeCode();
+        $zinreloOptedIn = $customerData->getCustomAttribute($opt_in_attribute);
+        if ($zinreloOptedIn) {
+            return $zinreloOptedIn->getValue();
+        }
+        return null;
+    }
+
+
     /**
      * Get Free Product
      *

Helper/Reward.php

@@ -22,7 +22,8 @@ public function getCollectRewardValueData($orderId, $flag, $actionData)
         $rewardData = $this->getRewardRulesData($quote, $redeemReward);
         if (isset($rewardData['rule'])
             && ($rewardData['rule'] == 'fixed_amount_discount'
-                || $rewardData['rule'] == 'percentage_discount')) {
+                || $rewardData['rule'] == 'percentage_discount'
+                || $rewardData['rule'] == 'flexible_points_reward')) {
 
             $totalAmount = $order->getSubtotal();
             if ($rewardData['rule'] == 'fixed_amount_discount') {