diff --git a/packages/Webkul/Product/src/Type/AbstractType.php b/packages/Webkul/Product/src/Type/AbstractType.php index 680dff0b5..3520b958c 100644 --- a/packages/Webkul/Product/src/Type/AbstractType.php +++ b/packages/Webkul/Product/src/Type/AbstractType.php @@ -230,7 +230,7 @@ abstract class AbstractType $data[$attribute->code] = isset($data[$attribute->code]) && $data[$attribute->code] ? 1 : 0; } - if (!isset($data[$attribute->code])) { + if (! isset($data[$attribute->code])) { continue; } @@ -259,7 +259,7 @@ abstract class AbstractType 'locale' => $attribute->value_per_locale ? $data['locale'] : null, ]); - if (!$attributeValue) { + if (! $attributeValue) { $this->attributeValueRepository->create([ 'product_id' => $product->id, 'attribute_id' => $attribute->id, @@ -284,7 +284,7 @@ abstract class AbstractType $route = request()->route() ? request()->route()->getName() : ""; if ($route !== 'admin.catalog.products.massupdate') { - if (!isset($data['categories'])) { + if (! isset($data['categories'])) { $data['categories'] = []; } @@ -351,7 +351,7 @@ abstract class AbstractType */ public function isSaleable() { - if (!$this->product->status) { + if (! $this->product->status) { return false; } @@ -503,7 +503,7 @@ abstract class AbstractType ); } - if (!$group) { + if (! $group) { return $this->product->attribute_family->custom_attributes()->whereNotIn( 'attributes.code', $this->skipAttributes @@ -594,8 +594,8 @@ abstract class AbstractType $specialPrice = $this->product->special_price; - if ((is_null($specialPrice) || !(float) $specialPrice) - && !$rulePrice + if ((is_null($specialPrice) || ! (float) $specialPrice) + && ! $rulePrice && $customerGroupPrice == $this->product->price ) { return false; @@ -603,7 +603,7 @@ abstract class AbstractType $haveSpecialPrice = false; - if (!(float) $specialPrice) { + if (! (float) $specialPrice) { if ($rulePrice && $rulePrice->price < $this->product->price) { $this->product->special_price = $rulePrice->price; @@ -665,7 +665,7 @@ abstract class AbstractType $customerGroupPrices = app(ProductCustomerGroupPriceRepository::class)->checkInLoadedCustomerGroupPrice($product, $customerGroupId); - if (!$customerGroupPrices->count()) { + if (! $customerGroupPrices->count()) { return $product->price; } @@ -798,7 +798,7 @@ abstract class AbstractType $data = $this->getQtyRequest($data); - if (!$this->haveSufficientQuantity($data['quantity'])) { + if (! $this->haveSufficientQuantity($data['quantity'])) { return trans('shop::app.checkout.cart.quantity.inventory_warning'); } @@ -858,9 +858,9 @@ abstract class AbstractType } else { return false; } - } elseif (isset($options1['parent_id']) && !isset($options2['parent_id'])) { + } elseif (isset($options1['parent_id']) && ! isset($options2['parent_id'])) { return false; - } elseif (isset($options2['parent_id']) && !isset($options1['parent_id'])) { + } elseif (isset($options2['parent_id']) && ! isset($options1['parent_id'])) { return false; } } diff --git a/packages/Webkul/Product/src/Type/Bundle.php b/packages/Webkul/Product/src/Type/Bundle.php index ee4ba114d..70d063ee3 100644 --- a/packages/Webkul/Product/src/Type/Bundle.php +++ b/packages/Webkul/Product/src/Type/Bundle.php @@ -2,17 +2,18 @@ namespace Webkul\Product\Type; +use Webkul\Tax\Helpers\Tax; +use Webkul\Checkout\Models\CartItem; +use Webkul\Product\Helpers\BundleOption; +use Webkul\Product\Repositories\ProductRepository; use Webkul\Attribute\Repositories\AttributeRepository; use Webkul\Product\Datatypes\CartItemValidationResult; -use Webkul\Product\Repositories\ProductRepository; -use Webkul\Product\Repositories\ProductAttributeValueRepository; -use Webkul\Product\Repositories\ProductInventoryRepository; use Webkul\Product\Repositories\ProductImageRepository; use Webkul\Product\Repositories\ProductVideoRepository; +use Webkul\Product\Repositories\ProductInventoryRepository; use Webkul\Product\Repositories\ProductBundleOptionRepository; +use Webkul\Product\Repositories\ProductAttributeValueRepository; use Webkul\Product\Repositories\ProductBundleOptionProductRepository; -use Webkul\Product\Helpers\BundleOption; -use Webkul\Checkout\Models\CartItem; class Bundle extends AbstractType { diff --git a/packages/Webkul/Product/src/Type/Configurable.php b/packages/Webkul/Product/src/Type/Configurable.php index f321149ca..2fa4e47e2 100644 --- a/packages/Webkul/Product/src/Type/Configurable.php +++ b/packages/Webkul/Product/src/Type/Configurable.php @@ -2,14 +2,14 @@ namespace Webkul\Product\Type; -use Webkul\Customer\Contracts\CartItem; -use Webkul\Product\Datatypes\CartItemValidationResult; -use Webkul\Product\Models\ProductAttributeValue; +use Illuminate\Support\Str; +use Webkul\Tax\Helpers\Tax; +use Illuminate\Support\Facades\DB; use Webkul\Product\Models\ProductFlat; use Webkul\Product\Facades\ProductImage; -use Illuminate\Support\Str; +use Webkul\Product\Models\ProductAttributeValue; use Webkul\Checkout\Models\CartItem as CartItemModel; -use Illuminate\Support\Facades\DB; +use Webkul\Product\Datatypes\CartItemValidationResult; class Configurable extends AbstractType { diff --git a/packages/Webkul/Product/src/Type/Grouped.php b/packages/Webkul/Product/src/Type/Grouped.php index e0714f189..0b97baa4b 100644 --- a/packages/Webkul/Product/src/Type/Grouped.php +++ b/packages/Webkul/Product/src/Type/Grouped.php @@ -2,6 +2,7 @@ namespace Webkul\Product\Type; +use Webkul\Tax\Helpers\Tax; use Webkul\Product\Models\ProductFlat; use Webkul\Product\Repositories\ProductRepository; use Webkul\Attribute\Repositories\AttributeRepository; @@ -188,7 +189,7 @@ class Grouped extends AbstractType $html .= '' . trans('shop::app.products.starting-at') . '' . ' ' - . '' . core()->currency($this->isTaxInclusive() ? $this->getTaxInclusiveRate($this->getMinimalPrice()) : $this->getMinimalPrice()) . ''; + . '' . core()->currency(Tax::isTaxInclusive() ? $this->getTaxInclusiveRate($this->getMinimalPrice()) : $this->getMinimalPrice()) . ''; return $html; }