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

Duplicate Query Removed

This commit is contained in:
Devansh 2022-04-13 16:46:33 +05:30
parent 28a81fb1ad
commit eae1c6b7f4
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/Webkul/Product/src/Type/AbstractType.php
View File

@ -674,12 +674,12 @@ abstract class AbstractType
{
return [
'regular_price' => [
'price' => core()->convertPrice($this->evaluatePrice($this->product->price)),
'formated_price' => core()->currency($this->evaluatePrice($this->product->price)),
'price' => core()->convertPrice($this->evaluatePrice($regularPrice = $this->product->price)),
'formated_price' => core()->currency($this->evaluatePrice($regularPrice)),
],
'final_price' => [
'price' => core()->convertPrice($this->evaluatePrice($this->getMinimalPrice())),
'formated_price' => core()->currency($this->evaluatePrice($this->getMinimalPrice())),
'price' => core()->convertPrice($this->evaluatePrice($minimalPrice = $this->getMinimalPrice())),
'formated_price' => core()->currency($this->evaluatePrice($minimalPrice)),
],
];
}

16
packages/Webkul/Product/src/Type/Bundle.php
View File

@ -340,23 +340,23 @@ class Bundle extends AbstractType
return [
'from' => [
'regular_price' => [
'price' => core()->convertPrice($this->evaluatePrice($this->getRegularMinimalPrice())),
'formated_price' => core()->currency($this->evaluatePrice($this->getRegularMinimalPrice())),
'price' => core()->convertPrice($this->evaluatePrice($regularMinimalPrice = $this->getRegularMinimalPrice())),
'formated_price' => core()->currency($this->evaluatePrice($regularMinimalPrice)),
],
'final_price' => [
'price' => core()->convertPrice($this->evaluatePrice($this->getMinimalPrice())),
'formated_price' => core()->currency($this->evaluatePrice($this->getMinimalPrice())),
'price' => core()->convertPrice($this->evaluatePrice($minimalPrice = $this->getMinimalPrice())),
'formated_price' => core()->currency($this->evaluatePrice($minimalPrice)),
],
],
'to' => [
'regular_price' => [
'price' => core()->convertPrice($this->evaluatePrice($this->getRegularMaximamPrice())),
'formated_price' => core()->currency($this->evaluatePrice($this->getRegularMaximamPrice())),
'price' => core()->convertPrice($this->evaluatePrice($regularMaximumPrice = $this->getRegularMaximamPrice())),
'formated_price' => core()->currency($this->evaluatePrice($regularMaximumPrice)),
],
'final_price' => [
'price' => core()->convertPrice($this->evaluatePrice($this->getMaximamPrice())),
'formated_price' => core()->currency($this->evaluatePrice($this->getMaximamPrice())),
'price' => core()->convertPrice($this->evaluatePrice($maximumPrice = $this->getMaximamPrice())),
'formated_price' => core()->currency($this->evaluatePrice($maximumPrice)),
],
],
];

14
packages/Webkul/Product/src/Type/Configurable.php
View File

@ -552,14 +552,16 @@ class Configurable extends AbstractType
*/
public function getProductPrices()
{
$haveOffer = $this->haveOffer();
return [
'regular_price' => [
'formated_price' => $this->haveOffer()
? core()->currency($this->evaluatePrice($this->getOfferPrice()))
: core()->currency($this->evaluatePrice($this->getMinimalPrice())),
'price' => $this->haveOffer()
? $this->evaluatePrice($this->getOfferPrice())
: $this->evaluatePrice($this->getMinimalPrice()),
'formated_price' => $haveOffer
? core()->currency($this->evaluatePrice($offerPrice = $this->getOfferPrice()))
: core()->currency($this->evaluatePrice($minimalPrice = $this->getMinimalPrice())),
'price' => $haveOffer
? $this->evaluatePrice($offerPrice)
: $this->evaluatePrice($minimalPrice),
],
];
}