diff --git a/app/Views/item_kits/form.php b/app/Views/item_kits/form.php
index 1b5f36e06..579b58e13 100644
--- a/app/Views/item_kits/form.php
+++ b/app/Views/item_kits/form.php
@@ -286,7 +286,7 @@
messages: {
name: "",
category: "",
- item_kit_number: ""
+ item_kit_number: ""
}
}, form_support.error));
});
diff --git a/app/Views/login.php b/app/Views/login.php
index 46c29bd8c..7a2099383 100644
--- a/app/Views/login.php
+++ b/app/Views/login.php
@@ -21,7 +21,7 @@ $request = Services::request();
-
<?= esc($config['company']) . ' | ' . esc(lang('Common.software_short')) . ' | ' . esc(lang('Login.login')) ?>
+
<?= esc($config['company']) . ' | OSPOS | ' . esc(lang('Login.login')) ?>
@@ -45,7 +45,7 @@ $request = Services::request();
![<?= esc(lang('Common.logo') . ' ' . $config['company']) ?>](<?= base_url('uploads/' . esc($config['company_logo'], 'url')) ?>)
@@ -60,7 +60,7 @@ $request = Services::request();
-
+
@@ -160,12 +160,12 @@ $request = Services::request();
-
+
Open Source Point of Sale
@@ -186,7 +186,7 @@ $request = Services::request();
migrateUrl: '',
loginUrl: '',
i18n: {
- welcome: ,
+ welcome: ,
initialize: ,
initializationRequired: ,
initializationMessage: ,
diff --git a/app/Views/partial/datepicker_locale.php b/app/Views/partial/datepicker_locale.php
index 6ad207e7b..31a1e54dd 100644
--- a/app/Views/partial/datepicker_locale.php
+++ b/app/Views/partial/datepicker_locale.php
@@ -58,7 +58,7 @@ $.fn.datetimepicker.dates[''] = {
"",
"",
"",
- "",
+ "",
"",
"",
"",
diff --git a/app/Views/partial/daterangepicker.php b/app/Views/partial/daterangepicker.php
index 210f4fdcf..5a1d15e87 100644
--- a/app/Views/partial/daterangepicker.php
+++ b/app/Views/partial/daterangepicker.php
@@ -90,7 +90,7 @@
"",
"",
"",
- "",
+ "",
"",
"",
"",
@@ -199,7 +199,7 @@
"",
"",
"",
- "",
+ "",
"",
"",
"",
diff --git a/app/Views/partial/footer.php b/app/Views/partial/footer.php
index ed1caa7e5..b6bf145c4 100644
--- a/app/Views/partial/footer.php
+++ b/app/Views/partial/footer.php
@@ -10,13 +10,13 @@ use Config\OSPOS;
diff --git a/app/Views/partial/header.php b/app/Views/partial/header.php
index 9542dff89..e8ed1866b 100644
--- a/app/Views/partial/header.php
+++ b/app/Views/partial/header.php
@@ -17,7 +17,7 @@ $request = Services::request();
-
<?= esc($config['company']) . ' | ' . lang('Common.powered_by') . ' OSPOS ' . esc(config('App')->application_version) ?>
+
<?= esc($config['company']) . ' | ' . lang('Common.powered_by', ['app' => 'OSPOS', 'version' => esc(config('App')->application_version)]) ?>
diff --git a/app/Views/sales/register.php b/app/Views/sales/register.php
index 584bbb887..dc5bbb25d 100644
--- a/app/Views/sales/register.php
+++ b/app/Views/sales/register.php
@@ -50,6 +50,10 @@ if (isset($error)) {
echo '
' . esc($error) . '
';
}
+if (!empty($error_message)) {
+ echo '
' . esc($error_message) . '
';
+}
+
if (!empty($warning)) {
echo '
' . esc($warning) . '
';
}
diff --git a/composer.json b/composer.json
index e30808599..04d378247 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
"matrix": "https://matrix.to/#/#opensourcepos_Lobby:gitter.im"
},
"require": {
- "php": ">=8.2.35 <8.3 || >=8.3.36 <8.4 || >=8.4.27",
+ "php": ">=8.2.35 <8.3 || >=8.3.36 <8.4 || >=8.4.27 <8.5 || >=8.5.12 <8.6",
"ext-intl": "*",
"codeigniter4/framework": "4.7.4",
"dompdf/dompdf": "^3.1.6",
diff --git a/composer.lock b/composer.lock
index 5b681415a..7069e2f88 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "5b7bf691a189373a64ba0cd8c9b3e46a",
+ "content-hash": "13515c65b00fddcbe40933bd582f44f1",
"packages": [
{
"name": "codeigniter4/framework",
@@ -5224,7 +5224,7 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": ">=8.2.35 <8.3 || >=8.3.36 <8.4 || >=8.4.27",
+ "php": ">=8.2.35 <8.3 || >=8.3.36 <8.4 || >=8.4.27 <8.5 || >=8.5.12 <8.6",
"ext-intl": "*"
},
"platform-dev": {},
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index 8b41f5ed1..bab3307a7 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -1,6 +1,6 @@
## Server Requirements
-- PHP version `8.2.35` to `8.4.27` are supported (minimum patch levels required for CVE-2026-109618 / CVE-2026-109619 security fixes). PHP version `≤ 8.1` is NOT supported. Please note that PHP needs to have the extensions `php-json`, `php-gd`, `php-bcmath`, `php-intl`, `php-openssl`, `php-mbstring`, `php-curl` and `php-xml` installed and enabled. An unstable master build can be downloaded in the releases section.
+- PHP version `8.2` (>= `8.2.35`), `8.3` (>= `8.3.36`), `8.4` (>= `8.4.27`), and `8.5` (>= `8.5.12`) are supported. PHP version `≤ 8.1` is NOT supported. Please note that PHP needs to have the extensions `php-json`, `php-gd`, `php-bcmath`, `php-intl`, `php-openssl`, `php-mbstring`, `php-curl` and `php-xml` installed and enabled. An unstable master build can be downloaded in the releases section.
- MySQL `5.7` is supported, also MariaDB replacement `10.x` is supported and might offer better performance.
- Apache `2.4` is supported. Nginx should work fine too, see [wiki page here](https://github.com/opensourcepos/opensourcepos/wiki/Local-Deployment-using-LEMP).
- Raspberry PI based installations proved to work, see [wiki page here](
).
diff --git a/tests/Controllers/CashupControllerTest.php b/tests/Controllers/CashupControllerTest.php
index 1a1444dcd..37d4947de 100644
--- a/tests/Controllers/CashupControllerTest.php
+++ b/tests/Controllers/CashupControllerTest.php
@@ -6,9 +6,12 @@ use App\Models\Cashup;
use CodeIgniter\Test\CIUnitTestCase;
use CodeIgniter\Test\DatabaseTestTrait;
use CodeIgniter\Test\FeatureTestTrait;
+use Tests\Support\CashupFixtureTrait;
use Tests\Support\DatabaseBootstrapTrait;
use Tests\Support\EmployeeFixtureTrait;
+use Tests\Support\ExpenseFixtureTrait;
use Tests\Support\OsposConfigFixtureTrait;
+use Tests\Support\SaleFixtureTrait;
class CashupControllerTest extends CIUnitTestCase
{
@@ -17,6 +20,9 @@ class CashupControllerTest extends CIUnitTestCase
use FeatureTestTrait;
use EmployeeFixtureTrait;
use OsposConfigFixtureTrait;
+ use CashupFixtureTrait;
+ use ExpenseFixtureTrait;
+ use SaleFixtureTrait;
protected $migrate = true;
protected $migrateOnce = true;
@@ -36,6 +42,7 @@ class CashupControllerTest extends CIUnitTestCase
'timeformat' => 'H:i:s',
'number_locale' => 'en_US',
'currency_decimals' => 2,
+ 'currency_symbol' => '$',
'thousands_separator' => ',',
]);
}
@@ -66,7 +73,7 @@ class CashupControllerTest extends CIUnitTestCase
]);
}
- public function testTamperedTotalIsRecomputedServerSide(): void
+ public function testPostSave_RecomputesTamperedTotalServerSide(): void
{
$cashierId = $this->createCashupEmployee();
$this->loginAs($cashierId);
@@ -96,7 +103,7 @@ class CashupControllerTest extends CIUnitTestCase
$this->assertEquals(60.0, (float) $cashup->closed_amount_total);
}
- public function testConsistentTotalIsStoredAndOwnerIsForcedToAuthenticatedUser(): void
+ public function testPostSave_StoresConsistentTotalAndForcesOwnerToAuthenticatedUser(): void
{
$cashierId = $this->createCashupEmployee();
$this->loginAs($cashierId);
@@ -128,4 +135,75 @@ class CashupControllerTest extends CIUnitTestCase
$this->assertEquals($cashierId, (int) $cashup->open_employee_id);
$this->assertEquals($cashierId, (int) $cashup->close_employee_id);
}
+
+ public function testPostAjaxCashupTotal_ReturnsCalculatedTotal(): void
+ {
+ $cashierId = $this->createCashupEmployee();
+ $this->loginAs($cashierId);
+
+ // 100 - 20 - 5 + 15 + 40 + 25 = 155
+ $response = $this->post('/cashups/ajax_cashup_total', [
+ 'open_amount_cash' => '20',
+ 'transfer_amount_cash' => '5',
+ 'closed_amount_cash' => '100',
+ 'closed_amount_due' => '15',
+ 'closed_amount_card' => '40',
+ 'closed_amount_check' => '25',
+ ]);
+
+ $response->assertStatus(200);
+ $result = json_decode($response->getJSON(), true);
+ $this->assertSame('155.00', $result['total']);
+ }
+
+ public function testGetView_PrefillsOpenDatesForNewEntry(): void
+ {
+ $cashierId = $this->createCashupEmployee();
+ $this->loginAs($cashierId);
+
+ $response = $this->get('/cashups/view/-1');
+
+ $response->assertStatus(200);
+ $response->assertSee(date('Y-m-d'));
+ }
+
+ public function testGetView_DoesNotRecalculateAlreadyClosedCashup(): void
+ {
+ $cashierId = $this->createCashupEmployee();
+ $this->loginAs($cashierId);
+
+ $cashupId = $this->createCashup($cashierId, $cashierId, ['closed_amount_cash' => 75.00]);
+
+ $response = $this->get("/cashups/view/$cashupId");
+
+ $response->assertStatus(200);
+ $response->assertSee(to_currency_no_money(75.00));
+ }
+
+ public function testGetView_AggregatesPaymentsAndSubtractsCashExpensesOnPendingClose(): void
+ {
+ $cashierId = $this->createCashupEmployee();
+ $this->loginAs($cashierId);
+
+ $cashupId = $this->createCashup($cashierId, $cashierId, [
+ 'open_amount_cash' => 100,
+ 'transfer_amount_cash' => 10,
+ ]);
+
+ $cashSaleId = $this->createSale($cashierId);
+ $this->createSalePayment($cashSaleId, $cashierId, 'Cash', 50);
+
+ $dueSaleId = $this->createSale($cashierId);
+ $this->createSalePayment($dueSaleId, $cashierId, 'Due', 20);
+
+ $categoryId = $this->createExpenseCategory();
+ $this->createExpense($cashierId, $categoryId, ['amount' => 15]);
+
+ $response = $this->get("/cashups/view/$cashupId");
+
+ $response->assertStatus(200);
+ $response->assertSeeInField('closed_amount_cash', to_currency_no_money(145));
+ $response->assertSeeInField('closed_amount_due', to_currency_no_money(20));
+ $response->assertSeeInField('closed_amount_total', to_currency_no_money(55));
+ }
}
diff --git a/tests/LanguageFilesTest.php b/tests/LanguageFilesTest.php
index 9338179df..1581b414d 100644
--- a/tests/LanguageFilesTest.php
+++ b/tests/LanguageFilesTest.php
@@ -3,10 +3,16 @@
namespace Tests;
use CodeIgniter\Test\CIUnitTestCase;
+use ParseError;
use PHPUnit\Framework\Attributes\DataProvider;
class LanguageFilesTest extends CIUnitTestCase
{
+ /**
+ * @var array>
+ */
+ private static array $englishKeysCache = [];
+
/**
* @return array
*/
@@ -29,10 +35,95 @@ class LanguageFilesTest extends CIUnitTestCase
{
try {
$result = include $file;
- } catch (\ParseError $parseError) {
+ } catch (ParseError $parseError) {
$this->fail("Failed to parse {$file}: {$parseError->getMessage()}");
}
$this->assertIsArray($result, "{$file} must return an array");
}
+
+ #[DataProvider('languageFileProvider')]
+ public function testLanguageFile_MatchesEnglishKeys(string $file): void
+ {
+ $baseName = basename($file);
+ if (! isset(self::$englishKeysCache[$baseName])) {
+ $enFile = realpath(__DIR__ . '/../app/Language/en/' . $baseName);
+ self::$englishKeysCache[$baseName] = array_keys(include $enFile);
+ }
+
+ $currentKeys = array_keys(include $file);
+ $expectedKeys = self::$englishKeysCache[$baseName];
+
+ $extra = array_diff($currentKeys, $expectedKeys);
+ $this->assertEmpty($extra, "{$file} has extra keys: " . implode(', ', $extra));
+
+ $missing = array_diff($expectedKeys, $currentKeys);
+ $this->assertEmpty($missing, "{$file} is missing keys: " . implode(', ', $missing));
+ }
+
+ #[DataProvider('languageFileProvider')]
+ public function testLanguageFile_RequiresAlphabeticalOrder(string $file): void
+ {
+ $baseName = basename($file);
+ if ($baseName === 'Calendar.php') {
+ $this->assertTrue(true);
+ return;
+ }
+
+ $keys = array_keys(include $file);
+ $sortedKeys = $keys;
+ sort($sortedKeys, SORT_STRING);
+
+ $this->assertSame($sortedKeys, $keys, "Keys in {$file} must be sorted alphabetically");
+ }
+
+ #[DataProvider('languageFileProvider')]
+ public function testLanguageFile_RejectsDuplicateKeys(string $file): void
+ {
+ $content = file_get_contents($file);
+ $lines = explode("\n", $content);
+ $seen = [];
+ $duplicates = [];
+
+ foreach ($lines as $line) {
+ if (preg_match('/^\s*\'([^\']+)\'\s*=>/', $line, $matches)) {
+ $key = $matches[1];
+ if (isset($seen[$key])) {
+ $duplicates[] = $key;
+ }
+ $seen[$key] = true;
+ }
+ }
+
+ $this->assertEmpty($duplicates, "Duplicate keys in {$file}: " . implode(', ', $duplicates));
+ }
+
+ public function testSupportedLocales_MatchesLanguageDirectories(): void
+ {
+ $appConfig = config('Config\App');
+ $languageRoot = realpath(__DIR__ . '/../app/Language');
+ $dirs = array_map('basename', glob($languageRoot . '/*', GLOB_ONLYDIR));
+
+ $missing = array_diff($dirs, $appConfig->supportedLocales);
+ $this->assertEmpty($missing, 'Config\App::$supportedLocales missing directories: ' . implode(', ', $missing));
+
+ $extra = array_diff($appConfig->supportedLocales, $dirs);
+ $this->assertEmpty($extra, 'Config\App::$supportedLocales has non-existent directories: ' . implode(', ', $extra));
+ }
+
+ public function testGetLanguages_MatchesLanguageDirectories(): void
+ {
+ helper('locale');
+ $languages = get_languages();
+ $registeredLocales = array_map(static fn ($key) => explode(':', $key)[0], array_keys($languages));
+
+ $languageRoot = realpath(__DIR__ . '/../app/Language');
+ $dirs = array_map('basename', glob($languageRoot . '/*', GLOB_ONLYDIR));
+
+ $missing = array_diff($dirs, $registeredLocales);
+ $this->assertEmpty($missing, 'locale_helper::get_languages() missing directories: ' . implode(', ', $missing));
+
+ $extra = array_diff($registeredLocales, $dirs);
+ $this->assertEmpty($extra, 'locale_helper::get_languages() has non-existent directories: ' . implode(', ', $extra));
+ }
}
diff --git a/tests/Models/GiftcardTest.php b/tests/Models/GiftcardTest.php
index 064996058..6c4750958 100644
--- a/tests/Models/GiftcardTest.php
+++ b/tests/Models/GiftcardTest.php
@@ -140,4 +140,53 @@ class GiftcardTest extends CIUnitTestCase
$this->assertSame(1, (int) $result1 + (int) $result2);
$this->assertEqualsWithDelta(40.00, $this->getGiftcardValue($giftcardNumber), 0.001);
}
+
+ public function testIncrementGiftcardValueSucceeds(): void
+ {
+ $giftcardNumber = $this->createGiftcard(50.00);
+ $giftcardModel = model(Giftcard::class);
+
+ $result = $giftcardModel->incrementGiftcardValue((string) $giftcardNumber, 30.00);
+
+ $this->assertTrue($result);
+ $this->assertEqualsWithDelta(80.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+ }
+
+ public function testIncrementGiftcardValueFailsWhenDeleted(): void
+ {
+ $giftcardNumber = $this->createGiftcard(50.00);
+
+ \Config\Database::connect()->table('giftcards')
+ ->where('giftcard_number', $giftcardNumber)
+ ->update(['deleted' => 1]);
+
+ $giftcardModel = model(Giftcard::class);
+
+ $result = $giftcardModel->incrementGiftcardValue((string) $giftcardNumber, 30.00);
+
+ $this->assertFalse($result);
+ $this->assertEqualsWithDelta(50.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+ }
+
+ public function testIncrementGiftcardValueRejectsNegativeAmount(): void
+ {
+ $giftcardNumber = $this->createGiftcard(50.00);
+ $giftcardModel = model(Giftcard::class);
+
+ $result = $giftcardModel->incrementGiftcardValue((string) $giftcardNumber, -10.00);
+
+ $this->assertFalse($result);
+ $this->assertEqualsWithDelta(50.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+ }
+
+ public function testIncrementGiftcardValueRejectsZeroAmount(): void
+ {
+ $giftcardNumber = $this->createGiftcard(50.00);
+ $giftcardModel = model(Giftcard::class);
+
+ $result = $giftcardModel->incrementGiftcardValue((string) $giftcardNumber, 0.00);
+
+ $this->assertFalse($result);
+ $this->assertEqualsWithDelta(50.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+ }
}
diff --git a/tests/Models/SaleTest.php b/tests/Models/SaleTest.php
index f2efedc80..edf5dc9f0 100644
--- a/tests/Models/SaleTest.php
+++ b/tests/Models/SaleTest.php
@@ -440,4 +440,125 @@ class SaleTest extends CIUnitTestCase
$this->assertSame([], $model->get_all_suspended(NEW_ENTRY));
$this->assertSame([], $model->get_all_suspended(123));
}
+
+ public function testSaveValueReturnCreditsGiftcardOnCompleted(): void
+ {
+ $employeeId = $this->createEmployee();
+ $giftcardNumber = $this->createGiftcard(50.00);
+ $itemId = $this->createTestItem(HAS_NO_STOCK);
+
+ $saleModel = model(Sale::class);
+ $saleStatus = COMPLETED;
+ $items = $this->buildCartLine($itemId, 1, 30.00);
+ $payments = [
+ 0 => [
+ 'payment_type' => lang('Sales.giftcard') . ':' . $giftcardNumber,
+ 'payment_amount' => -30.00,
+ 'cash_refund' => 0,
+ 'cash_adjustment' => 0,
+ 'reference_code' => null,
+ ],
+ ];
+ $salesTaxes = [[], []];
+
+ $result = $saleModel->save_value(
+ NEW_ENTRY,
+ $saleStatus,
+ $items,
+ NEW_ENTRY,
+ $employeeId,
+ 'test return',
+ null,
+ null,
+ null,
+ SALE_TYPE_RETURN,
+ $payments,
+ null,
+ $salesTaxes
+ );
+
+ $this->assertGreaterThan(0, $result);
+ $this->assertEqualsWithDelta(80.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+ }
+
+ public function testSaveValueReturnSkipsGiftcardCreditOnSuspended(): void
+ {
+ $employeeId = $this->createEmployee();
+ $giftcardNumber = $this->createGiftcard(50.00);
+ $itemId = $this->createTestItem(HAS_NO_STOCK);
+
+ $saleModel = model(Sale::class);
+ $saleStatus = SUSPENDED;
+ $items = $this->buildCartLine($itemId, 1, 30.00);
+ $payments = [
+ 0 => [
+ 'payment_type' => lang('Sales.giftcard') . ':' . $giftcardNumber,
+ 'payment_amount' => -30.00,
+ 'cash_refund' => 0,
+ 'cash_adjustment' => 0,
+ 'reference_code' => null,
+ ],
+ ];
+ $salesTaxes = [[], []];
+
+ $result = $saleModel->save_value(
+ NEW_ENTRY,
+ $saleStatus,
+ $items,
+ NEW_ENTRY,
+ $employeeId,
+ 'test suspended return',
+ null,
+ null,
+ null,
+ SALE_TYPE_RETURN,
+ $payments,
+ null,
+ $salesTaxes
+ );
+
+ $this->assertGreaterThan(0, $result);
+ $this->assertEqualsWithDelta(50.00, $this->getGiftcardValue($giftcardNumber), 0.001);
+ }
+
+ public function testSaveValueReturnRejectsEmptyGiftcardNumber(): void
+ {
+ $employeeId = $this->createEmployee();
+ $itemId = $this->createTestItem(HAS_NO_STOCK);
+
+ $salesCountBefore = $this->countSalesRows();
+
+ $saleModel = model(Sale::class);
+ $saleStatus = COMPLETED;
+ $items = $this->buildCartLine($itemId, 1, 30.00);
+ $payments = [
+ 0 => [
+ 'payment_type' => lang('Sales.giftcard') . ':',
+ 'payment_amount' => -30.00,
+ 'cash_refund' => 0,
+ 'cash_adjustment' => 0,
+ 'reference_code' => null,
+ ],
+ ];
+ $salesTaxes = [[], []];
+
+ $result = $saleModel->save_value(
+ NEW_ENTRY,
+ $saleStatus,
+ $items,
+ NEW_ENTRY,
+ $employeeId,
+ 'test return no card',
+ null,
+ null,
+ null,
+ SALE_TYPE_RETURN,
+ $payments,
+ null,
+ $salesTaxes
+ );
+
+ $this->assertSame(INSUFFICIENT_GIFTCARD_BALANCE, $result);
+ $this->assertSame($salesCountBefore, $this->countSalesRows());
+ }
}
diff --git a/tests/Support/CashupFixtureTrait.php b/tests/Support/CashupFixtureTrait.php
new file mode 100644
index 000000000..39ad3579d
--- /dev/null
+++ b/tests/Support/CashupFixtureTrait.php
@@ -0,0 +1,32 @@
+ date('Y-m-d H:i:s'),
+ 'close_date' => date('Y-m-d H:i:s'),
+ 'open_amount_cash' => 0,
+ 'transfer_amount_cash' => 0,
+ 'closed_amount_cash' => 0,
+ 'closed_amount_due' => 0,
+ 'closed_amount_card' => 0,
+ 'closed_amount_check' => 0,
+ 'closed_amount_total' => 0,
+ 'note' => 0,
+ 'description' => 'Test cashup',
+ 'open_employee_id' => $openEmployeeId,
+ 'close_employee_id' => $closeEmployeeId,
+ 'deleted' => 0,
+ ], $overrides);
+
+ model(Cashup::class)->save_value($cashupData, NEW_ENTRY);
+
+ return (int) $cashupData['cashup_id'];
+ }
+}
diff --git a/tests/Support/ExpenseFixtureTrait.php b/tests/Support/ExpenseFixtureTrait.php
new file mode 100644
index 000000000..8a2ef55ab
--- /dev/null
+++ b/tests/Support/ExpenseFixtureTrait.php
@@ -0,0 +1,39 @@
+ 'Test Category ' . uniqid(),
+ 'category_description' => '',
+ 'deleted' => 0,
+ ], $overrides);
+
+ model(Expense_category::class)->save_value($categoryData);
+
+ return (int) $categoryData['expense_category_id'];
+ }
+
+ protected function createExpense(int $employeeId, int $categoryId, array $overrides = []): int
+ {
+ $expenseData = array_merge([
+ 'date' => date('Y-m-d H:i:s'),
+ 'amount' => 0,
+ 'payment_type' => 'Cash',
+ 'expense_category_id' => $categoryId,
+ 'description' => 'Test expense',
+ 'employee_id' => $employeeId,
+ 'deleted' => 0,
+ ], $overrides);
+
+ model(Expense::class)->save_value($expenseData);
+
+ return (int) $expenseData['expense_id'];
+ }
+}
diff --git a/tests/Support/SaleFixtureTrait.php b/tests/Support/SaleFixtureTrait.php
index 6b29600a6..f79c88e37 100644
--- a/tests/Support/SaleFixtureTrait.php
+++ b/tests/Support/SaleFixtureTrait.php
@@ -62,4 +62,22 @@ trait SaleFixtureTrait
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();
+ }
}