From 973332f6c06e04407b6df6b2d3834d7f9c6a4102 Mon Sep 17 00:00:00 2001 From: jitendra Date: Fri, 1 Nov 2019 11:03:40 +0530 Subject: [PATCH] Issue #1724 fixed --- packages/Webkul/Checkout/src/Cart.php | 6 +++--- packages/Webkul/Core/src/Models/Channel.php | 2 +- packages/Webkul/Core/src/Repositories/ChannelRepository.php | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index c0c5f68ed..f1ac70b86 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -676,8 +676,8 @@ class Cart { $this->cartItemRepository->update([ 'price' => core()->convertPrice($price), 'base_price' => $price, - 'total' => core()->convertPrice($price * ($item->quantity)), - 'base_total' => $price * ($item->quantity), + 'total' => core()->convertPrice($price * $item->quantity), + 'base_total' => $price * $item->quantity, ], $item->id); } @@ -689,7 +689,7 @@ class Cart { * Calculates cart items tax * * @return void - */ + */ public function calculateItemsTax() { if (! $cart = $this->getCart()) diff --git a/packages/Webkul/Core/src/Models/Channel.php b/packages/Webkul/Core/src/Models/Channel.php index 06b5fa05f..963418413 100755 --- a/packages/Webkul/Core/src/Models/Channel.php +++ b/packages/Webkul/Core/src/Models/Channel.php @@ -10,7 +10,7 @@ use Webkul\Core\Contracts\Channel as ChannelContract; class Channel extends Model implements ChannelContract { - protected $fillable = ['code', 'name', 'description', 'theme', 'home_page_content', 'footer_content', 'hostname', 'default_locale_id', 'base_currency_id', 'root_category_id', 'home_seo', 'logo', 'favicon']; + protected $fillable = ['code', 'name', 'description', 'theme', 'home_page_content', 'footer_content', 'hostname', 'default_locale_id', 'base_currency_id', 'root_category_id', 'home_seo']; /** * Get the channel locales. diff --git a/packages/Webkul/Core/src/Repositories/ChannelRepository.php b/packages/Webkul/Core/src/Repositories/ChannelRepository.php index c81712517..6513e1cb2 100755 --- a/packages/Webkul/Core/src/Repositories/ChannelRepository.php +++ b/packages/Webkul/Core/src/Repositories/ChannelRepository.php @@ -76,7 +76,6 @@ class ChannelRepository extends Repository */ public function uploadImages($data, $channel, $type = "logo") { - if (isset($data[$type])) { foreach ($data[$type] as $imageId => $image) { $file = $type . '.' . $imageId;