merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1106 from prashant-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-06-26 14:33:29 +05:30 committed by GitHub
parent a60e339218 00ba0f2e71
commit fe14287b07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/Webkul/Discount/src/Helpers/CouponAbleRule.php
View File

@ -26,7 +26,6 @@ class CouponAbleRule extends Discount
} else {
$rules = $this->cartRule->findWhere([
'use_coupon' => 1,
'is_guest' => 1,
'status' => 1
]);
}

12
packages/Webkul/Discount/src/Helpers/Discount.php
View File

@ -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;

1
packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php
View File

@ -27,7 +27,6 @@ class NonCouponAbleRule extends Discount
} else {
$rules = $this->cartRule->findWhere([
'use_coupon' => 0,
'is_guest' => 1,
'status' => 1
]);
}

4
packages/Webkul/Discount/src/Models/CartRuleCustomerGroups.php
View File

@ -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');
}
}