diff --git a/packages/Webkul/Discount/src/Helpers/CouponAbleRule.php b/packages/Webkul/Discount/src/Helpers/CouponAbleRule.php index 19fbd3127..7ae8a2585 100644 --- a/packages/Webkul/Discount/src/Helpers/CouponAbleRule.php +++ b/packages/Webkul/Discount/src/Helpers/CouponAbleRule.php @@ -26,7 +26,6 @@ class CouponAbleRule extends Discount } else { $rules = $this->cartRule->findWhere([ 'use_coupon' => 1, - 'is_guest' => 1, 'status' => 1 ]); } diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index 4f239d198..704f15631 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -369,7 +369,11 @@ abstract class Discount $shipping_city = $shipping_address->city ?? null; - $payment_method = $paymentMethods[$cart->payment->method]['title']; + if (isset($cart->payment)) { + $payment_method = $paymentMethods[$cart->payment->method]['title']; + } else { + $payment_method = null; + } $sub_total = $cart->base_sub_total; @@ -489,7 +493,11 @@ abstract class Discount $shipping_city = $shipping_address->city ?? null; - $payment_method = $paymentMethods[$cart->payment->method]['title']; + if (isset($cart->payment)) { + $payment_method = $paymentMethods[$cart->payment->method]['title']; + } else { + $payment_method = null; + } $sub_total = $cart->base_sub_total; diff --git a/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php b/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php index b747860fe..035c67232 100644 --- a/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php +++ b/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php @@ -27,7 +27,6 @@ class NonCouponAbleRule extends Discount } else { $rules = $this->cartRule->findWhere([ 'use_coupon' => 0, - 'is_guest' => 1, 'status' => 1 ]); } diff --git a/packages/Webkul/Discount/src/Models/CartRuleCustomerGroups.php b/packages/Webkul/Discount/src/Models/CartRuleCustomerGroups.php index a3e70fee4..951b844ff 100644 --- a/packages/Webkul/Discount/src/Models/CartRuleCustomerGroups.php +++ b/packages/Webkul/Discount/src/Models/CartRuleCustomerGroups.php @@ -3,7 +3,7 @@ namespace Webkul\Discount\Models; use Illuminate\Database\Eloquent\Model; -use Webkul\Customer\Moels\CustomerGroupProxy; +use Webkul\Customer\Models\CustomerGroupProxy; use Webkul\Discount\Contracts\CartRuleCustomerGroups as CartRuleCustomerGroupContract; class CartRuleCustomerGroups extends Model implements CartRuleCustomerGroupContract @@ -14,6 +14,6 @@ class CartRuleCustomerGroups extends Model implements CartRuleCustomerGroupContr public function customer_group() { - return $this->hasOne(CustomerGroupProxy::modelClass()); + return $this->hasOne(CustomerGroupProxy::modelClass(), 'id', 'customer_group_id'); } }