mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2026-05-07 05:39:37 +00:00
Add price columns to project BOM table and build price summary (#1345)
* Add unit price and extended price columns to project BOM table Adds two optional columns to the project BOM datatable (hidden by default, toggleable via column visibility): - **Price**: unit price for the BOM entry in the base currency, looked up via PricedetailHelper. For parts whose BOM quantity falls below the minimum order amount the minimum order amount is used for the price tier lookup so that a price is always returned. - **Extended Price**: unit price multiplied by the BOM quantity. Prices are rendered via MoneyFormatter (locale-aware, with currency symbol). Both columns round up to 2 decimal places to avoid displaying 0.00 for very small prices. * Add translation key for project.bom.ext_price Adds the English translation "Extended Price" for the new BOM extended price column. Other languages are marked needs-translation and will be picked up by Crowdin. * Add build price summary to project info tab Displays the total BOM price for N builds on the project info page, using the existing price-tier logic from PricedetailHelper. The user can adjust the number of builds via a small form; the unit price is also shown when N > 1. New backend: - ProjectBuildHelper gains calculateTotalBuildPrice(), calculateUnitBuildPrice(), roundedTotalBuildPrice(), and roundedUnitBuildPrice() — bulk-order quantities are factored in so that price tiers apply correctly across N builds. - ProjectController::info() now reads ?n= and passes number_of_builds to the template. Template (_info.html.twig): - Adds price badge (hidden when no pricing data is available). - Adds number-of-builds form that reloads the info page. * Add tests for build price calculation in ProjectBuildHelper Covers calculateTotalBuildPrice(), calculateUnitBuildPrice(), roundedTotalBuildPrice(), and the private getBomEntryUnitPrice() helper. Scenarios tested: empty project, no pricing data, non-part BOM entries with manual prices, part entries with pricedetails, mixed entries, rounding-up of sub-cent prices, and minimum order amount floor for price tier lookup. * Deduplicate BOM entry price logic into ProjectBuildHelper The private getBomEntryUnitPrice() in ProjectBomEntriesDataTable was identical to the one in ProjectBuildHelper. Replaced it with a new public getEntryUnitPrice() on ProjectBuildHelper (returns BigDecimal, never null) and delegate to it from the DataTable. This eliminates the duplicate code and brings the DataTable lines under the existing ProjectBuildHelper test coverage. Added three tests for getEntryUnitPrice() covering the no-pricing, non-part, and part cases. * Added type hint to service --------- Co-authored-by: Jan Böhmer <mail@jan-boehmer.de>
This commit is contained in:
Niklas
GitHub
parent
5b86d6f652
commit
c17cf5e83c
16 changed files with 398 additions and 13 deletions
|
|
@ -26,13 +26,15 @@ use App\Entity\Parts\Part;
|
|||
use App\Entity\Parts\PartLot;
|
||||
use App\Entity\ProjectSystem\Project;
|
||||
use App\Entity\ProjectSystem\ProjectBOMEntry;
|
||||
use App\Entity\PriceInformations\Orderdetail;
|
||||
use App\Entity\PriceInformations\Pricedetail;
|
||||
use App\Services\ProjectSystem\ProjectBuildHelper;
|
||||
use Brick\Math\BigDecimal;
|
||||
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
|
||||
|
||||
final class ProjectBuildHelperTest extends WebTestCase
|
||||
{
|
||||
/** @var ProjectBuildHelper */
|
||||
protected $service;
|
||||
protected ProjectBuildHelper $service;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
|
|
@ -130,6 +132,180 @@ final class ProjectBuildHelperTest extends WebTestCase
|
|||
$project->addBomEntry($bom_entry1);
|
||||
|
||||
$this->assertSame('∞', $this->service->getMaximumBuildableCountAsString($project));
|
||||
}
|
||||
|
||||
// --- Build price tests ---
|
||||
|
||||
private function makePartWithPrice(float $pricePerPiece, float $minQty = 1.0): Part
|
||||
{
|
||||
$part = new Part();
|
||||
$orderdetail = new Orderdetail();
|
||||
$pricedetail = (new Pricedetail())
|
||||
->setMinDiscountQuantity($minQty)
|
||||
->setPrice(BigDecimal::of((string) $pricePerPiece));
|
||||
$orderdetail->addPricedetail($pricedetail);
|
||||
$part->addOrderdetail($orderdetail);
|
||||
return $part;
|
||||
}
|
||||
|
||||
public function testCalculateTotalBuildPriceEmptyProject(): void
|
||||
{
|
||||
$project = new Project();
|
||||
$this->assertNull($this->service->calculateTotalBuildPrice($project));
|
||||
}
|
||||
|
||||
public function testCalculateTotalBuildPriceNoPricingData(): void
|
||||
{
|
||||
$project = new Project();
|
||||
// Part with no orderdetails — no pricing
|
||||
$entry = (new ProjectBOMEntry())->setPart(new Part())->setQuantity(2);
|
||||
$project->addBomEntry($entry);
|
||||
|
||||
$this->assertNull($this->service->calculateTotalBuildPrice($project));
|
||||
}
|
||||
|
||||
public function testCalculateTotalBuildPriceNonPartEntry(): void
|
||||
{
|
||||
$project = new Project();
|
||||
$entry = new ProjectBOMEntry();
|
||||
$entry->setName('Custom wire');
|
||||
$entry->setQuantity(3);
|
||||
$entry->setPrice(BigDecimal::of('2.00'));
|
||||
$project->addBomEntry($entry);
|
||||
|
||||
// 3 × 2.00 = 6.00 for 1 build
|
||||
$result = $this->service->calculateTotalBuildPrice($project, 1);
|
||||
$this->assertNotNull($result);
|
||||
$this->assertTrue(BigDecimal::of('6.00')->isEqualTo($result));
|
||||
}
|
||||
|
||||
public function testCalculateTotalBuildPriceNonPartEntryMultipleBuilds(): void
|
||||
{
|
||||
$project = new Project();
|
||||
$entry = new ProjectBOMEntry();
|
||||
$entry->setName('Custom wire');
|
||||
$entry->setQuantity(3);
|
||||
$entry->setPrice(BigDecimal::of('2.00'));
|
||||
$project->addBomEntry($entry);
|
||||
|
||||
// 3 × 2.00 × 5 = 30.00 for 5 builds
|
||||
$result = $this->service->calculateTotalBuildPrice($project, 5);
|
||||
$this->assertNotNull($result);
|
||||
$this->assertTrue(BigDecimal::of('30.00')->isEqualTo($result));
|
||||
}
|
||||
|
||||
public function testCalculateTotalBuildPriceWithPart(): void
|
||||
{
|
||||
$project = new Project();
|
||||
$entry = new ProjectBOMEntry();
|
||||
$entry->setPart($this->makePartWithPrice(1.50));
|
||||
$entry->setQuantity(4);
|
||||
$project->addBomEntry($entry);
|
||||
|
||||
// 4 × 1.50 = 6.00 for 1 build
|
||||
$result = $this->service->calculateTotalBuildPrice($project, 1);
|
||||
$this->assertNotNull($result);
|
||||
$this->assertTrue(BigDecimal::of('6.00')->isEqualTo($result));
|
||||
}
|
||||
|
||||
public function testCalculateUnitBuildPriceEqualsTotal(): void
|
||||
{
|
||||
$project = new Project();
|
||||
$entry = new ProjectBOMEntry();
|
||||
$entry->setName('Screw');
|
||||
$entry->setQuantity(10);
|
||||
$entry->setPrice(BigDecimal::of('0.10'));
|
||||
$project->addBomEntry($entry);
|
||||
|
||||
// unit = 10 × 0.10 = 1.00; total for 3 builds = 3.00
|
||||
$unit = $this->service->calculateUnitBuildPrice($project, 3);
|
||||
$total = $this->service->calculateTotalBuildPrice($project, 3);
|
||||
$this->assertNotNull($unit);
|
||||
$this->assertNotNull($total);
|
||||
$this->assertTrue($total->isEqualTo($unit->multipliedBy(3)));
|
||||
}
|
||||
|
||||
public function testRoundedTotalBuildPriceRoundsUp(): void
|
||||
{
|
||||
$project = new Project();
|
||||
$entry = new ProjectBOMEntry();
|
||||
$entry->setName('Tiny part');
|
||||
$entry->setQuantity(1);
|
||||
$entry->setPrice(BigDecimal::of('0.001'));
|
||||
$project->addBomEntry($entry);
|
||||
|
||||
// 0.001 rounded up to 2dp = 0.01
|
||||
$result = $this->service->roundedTotalBuildPrice($project, 1);
|
||||
$this->assertNotNull($result);
|
||||
$this->assertTrue(BigDecimal::of('0.01')->isEqualTo($result));
|
||||
}
|
||||
|
||||
public function testCalculateTotalBuildPriceMixedEntries(): void
|
||||
{
|
||||
$project = new Project();
|
||||
|
||||
// Part entry: 2 × 3.00 = 6.00
|
||||
$partEntry = new ProjectBOMEntry();
|
||||
$partEntry->setPart($this->makePartWithPrice(3.00));
|
||||
$partEntry->setQuantity(2);
|
||||
$project->addBomEntry($partEntry);
|
||||
|
||||
// Non-part entry with price: 5 × 1.00 = 5.00
|
||||
$nonPartEntry = new ProjectBOMEntry();
|
||||
$nonPartEntry->setName('Solder');
|
||||
$nonPartEntry->setQuantity(5);
|
||||
$nonPartEntry->setPrice(BigDecimal::of('1.00'));
|
||||
$project->addBomEntry($nonPartEntry);
|
||||
|
||||
// Total = 11.00
|
||||
$result = $this->service->calculateTotalBuildPrice($project, 1);
|
||||
$this->assertNotNull($result);
|
||||
$this->assertTrue(BigDecimal::of('11.00')->isEqualTo($result));
|
||||
}
|
||||
|
||||
public function testGetEntryUnitPriceReturnsZeroForNoPricingData(): void
|
||||
{
|
||||
$entry = new ProjectBOMEntry();
|
||||
$entry->setPart(new Part()); // part with no orderdetails
|
||||
$entry->setQuantity(5);
|
||||
|
||||
$result = $this->service->getEntryUnitPrice($entry);
|
||||
$this->assertTrue(BigDecimal::zero()->isEqualTo($result));
|
||||
}
|
||||
|
||||
public function testGetEntryUnitPriceNonPartEntry(): void
|
||||
{
|
||||
$entry = new ProjectBOMEntry();
|
||||
$entry->setName('Wire');
|
||||
$entry->setQuantity(2);
|
||||
$entry->setPrice(BigDecimal::of('1.25'));
|
||||
|
||||
$result = $this->service->getEntryUnitPrice($entry);
|
||||
$this->assertTrue(BigDecimal::of('1.25')->isEqualTo($result));
|
||||
}
|
||||
|
||||
public function testGetEntryUnitPriceWithPart(): void
|
||||
{
|
||||
$entry = new ProjectBOMEntry();
|
||||
$entry->setPart($this->makePartWithPrice(2.00));
|
||||
$entry->setQuantity(3);
|
||||
|
||||
$result = $this->service->getEntryUnitPrice($entry);
|
||||
$this->assertTrue(BigDecimal::of('2.00')->isEqualTo($result));
|
||||
}
|
||||
|
||||
public function testCalculateTotalBuildPriceRespectsMinOrderAmount(): void
|
||||
{
|
||||
$project = new Project();
|
||||
// Part has a minimum order quantity of 10 at 0.50/piece
|
||||
$entry = new ProjectBOMEntry();
|
||||
$entry->setPart($this->makePartWithPrice(0.50, 10.0));
|
||||
$entry->setQuantity(1); // BOM only needs 1, but MOQ is 10
|
||||
$project->addBomEntry($entry);
|
||||
|
||||
// Price lookup uses qty=10 (MOQ), returns 0.50. Cost = 1 × 0.50 = 0.50
|
||||
$result = $this->service->calculateTotalBuildPrice($project, 1);
|
||||
$this->assertNotNull($result);
|
||||
$this->assertTrue(BigDecimal::of('0.50')->isEqualTo($result));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue