mirror of
https://github.com/opensourcepos/opensourcepos.git
synced 2026-11-08 23:43:32 -05:00
objecttothis
f5233b20e6
Introduce a CashupAmounts transfer object and break down large Cashups controller methods into focused private helpers. Includes a breaking change to constructor parameter order. - Add CashupAmounts (TransferObjects/Cashups) to bundle open/transfer/ closed cash, due, card, and check amounts; reorder constructor params to cash-before-due sequence - Replace positional _calculate_total() with calculateTotal(CashupAmounts), eliminating argument-order errors - Decompose getView() into buildEmployeeLookup(), normalizeCashupInfo(), initializeNewCashup(), isPendingClose(), closeCashup(), buildReportDateRangeInputs(), applyPaymentTotals(), subtractCashExpenses() - Decompose postSave() with parseCashupDate() and getCashupAmountsFromPost() helpers; update both CashupAmounts call sites to new param order - Rename snake_case vars/params to camelCase throughout Cashups controller - Drop stale TODO comments in OSPOS.php and Cashups::getIndex filter block - Scope escape => false to cashup_headers() note column rather than a broad regex exclusion in transform_headers() - Add CashupFixtureTrait and ExpenseFixtureTrait under tests/Support; tighten cashup view test to assertSeeInField on specific form fields BREAKING CHANGE: CashupAmounts constructor positional argument order changed — closedAmountCash now precedes closedAmountDue; any callers passing positional args must swap those two arguments. Signed-off-by: objecttothis <17935339+objecttothis@users.noreply.github.com>
84 lines
2.5 KiB
PHP
84 lines
2.5 KiB
PHP
<?php
|
|
|
|
namespace Tests\Support;
|
|
|
|
use App\Models\Sale;
|
|
use Config\Database;
|
|
|
|
trait SaleFixtureTrait
|
|
{
|
|
/**
|
|
* Inserts a minimal completed sale row directly, bypassing Sale::save_value()
|
|
* (which requires a full cart/inventory/tax pipeline unrelated to authorization
|
|
* checks). Sale::get_info() inner-joins sales_items, so a matching item/
|
|
* sales_items row is required for the sale to be found.
|
|
*/
|
|
protected function createSale(int $employeeId): int
|
|
{
|
|
$unique = uniqid();
|
|
$db = Database::connect();
|
|
|
|
$db->table('items')->insert([
|
|
'name' => "Test Item $unique",
|
|
'category' => 'Test',
|
|
'description' => 'Test item',
|
|
'cost_price' => 1,
|
|
'unit_price' => 1,
|
|
'item_number' => "TEST-$unique",
|
|
]);
|
|
$itemId = (int) $db->insertID();
|
|
|
|
$db->table('sales')->insert([
|
|
'sale_time' => date('Y-m-d H:i:s'),
|
|
'customer_id' => null,
|
|
'employee_id' => $employeeId,
|
|
'comment' => 'test sale',
|
|
'invoice_number' => null,
|
|
]);
|
|
$saleId = (int) $db->insertID();
|
|
|
|
$db->table('sales_items')->insert([
|
|
'sale_id' => $saleId,
|
|
'item_id' => $itemId,
|
|
'line' => 1,
|
|
'quantity_purchased' => 1,
|
|
'item_cost_price' => 1,
|
|
'item_unit_price' => 1,
|
|
'item_location' => 1,
|
|
]);
|
|
|
|
return $saleId;
|
|
}
|
|
|
|
/**
|
|
* Same as createSale(), but flips the sale to SUSPENDED afterward so
|
|
* postUnsuspend's status check can be exercised.
|
|
*/
|
|
protected function createSuspendedSale(int $employeeId): int
|
|
{
|
|
$saleId = $this->createSale($employeeId);
|
|
|
|
model(Sale::class)->update_sale_status($saleId, SUSPENDED);
|
|
|
|
return $saleId;
|
|
}
|
|
|
|
protected function createSalePayment(int $saleId, int $employeeId, string $paymentType, float $amount): int
|
|
{
|
|
$db = Database::connect();
|
|
|
|
$db->table('sales_payments')->insert([
|
|
'sale_id' => $saleId,
|
|
'payment_type' => $paymentType,
|
|
'payment_amount' => $amount,
|
|
'cash_refund' => 0,
|
|
'cash_adjustment' => 0,
|
|
'employee_id' => $employeeId,
|
|
'payment_time' => date('Y-m-d H:i:s'),
|
|
'reference_code' => '',
|
|
]);
|
|
|
|
return (int) $db->insertID();
|
|
}
|
|
}
|