@@ -178,6 +178,8 @@ var app = new Vue({ | |||
var price = pricesArray[i].price; | |||
var fromQuantity = pricesArray[i].from_quantity; | |||
console.log(pricesArray[i]); | |||
console.log(price+" / "+thePrice+" / "+fromQuantity+" / "+theQuantity+" / "); | |||
if (price < thePrice && fromQuantity <= theQuantity) { | |||
thePrice = price; | |||
} |
@@ -428,14 +428,15 @@ class Product extends ActiveRecordCommon | |||
// base price | |||
$priceArray[] = [ | |||
'from_quantity' => 0, | |||
'price' => $this->getPrice(), | |||
'price_with_tax' => $this->getPriceWithTax(), | |||
]; | |||
} | |||
usort($priceArray, function ($a, $b) { | |||
if ($a['price_with_tax'] < $b['price_with_tax']) { | |||
if ($a['price'] < $b['price']) { | |||
return 1; | |||
} elseif ($a['price_with_tax'] > $b['price_with_tax']) { | |||
} elseif ($a['price'] > $b['price']) { | |||
return -1; | |||
} else { | |||
return 0; |