Jingga/oms-Billing
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Billing.git synced 2026-02-13 14:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Karaka-Management/oms-Billing into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-09-25 11:33:33 +00:00
commit 7b7f38b643
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Controller/ApiAttributeController.php
View File

@ -447,7 +447,6 @@ final class ApiAttributeController extends Controller
*/ */
public function apiBillAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiBillAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
return;
// @todo: I don't think values can be deleted? Only Attributes // @todo: I don't think values can be deleted? Only Attributes
// However, It should be possible to remove UNUSED default values // However, It should be possible to remove UNUSED default values
// either here or other function? // either here or other function?

2
Models/BillTypeMapper.php
View File

@ -44,7 +44,7 @@ final class BillTypeMapper extends DataMapperFactory
'billing_type_transfer_type' => ['name' => 'billing_type_transfer_type', 'type' => 'int', 'internal' => 'transferType'], 'billing_type_transfer_type' => ['name' => 'billing_type_transfer_type', 'type' => 'int', 'internal' => 'transferType'],
'billing_type_default_template' => ['name' => 'billing_type_default_template', 'type' => 'int', 'internal' => 'defaultTemplate'], 'billing_type_default_template' => ['name' => 'billing_type_default_template', 'type' => 'int', 'internal' => 'defaultTemplate'],
'billing_type_transfer_stock' => ['name' => 'billing_type_transfer_stock', 'type' => 'bool', 'internal' => 'transferStock'], 'billing_type_transfer_stock' => ['name' => 'billing_type_transfer_stock', 'type' => 'bool', 'internal' => 'transferStock'],
'billing_type_transfer_sign' => ['name' => 'billing_type_transfer_sign', 'type' => 'int', 'internal' => 'sign'], 'billing_type_transfer_sign' => ['name' => 'billing_type_transfer_sign', 'type' => 'int', 'internal' => 'sign'],
'billing_type_is_template' => ['name' => 'billing_type_is_template', 'type' => 'bool', 'internal' => 'isTemplate'], 'billing_type_is_template' => ['name' => 'billing_type_is_template', 'type' => 'bool', 'internal' => 'isTemplate'],
]; ];

2
tests/Controller/ApiControllerTest.php
View File

@ -70,7 +70,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$account = new Account(); $account = new Account();
TestUtils::setMember($account, 'id', 1); TestUtils::setMember($account, 'id', 1);
$permission = new AccountPermission(); $permission = new AccountPermission();
$permission->unit = 1; $permission->unit = 1;
$permission->app = 2; $permission->app = 2;
$permission->setPermission( $permission->setPermission(

3
tests/Models/BillTest.php
View File

@ -18,7 +18,6 @@ use Modules\Billing\Models\Bill;
use Modules\Billing\Models\BillElement; use Modules\Billing\Models\BillElement;
use Modules\Billing\Models\BillStatus; use Modules\Billing\Models\BillStatus;
use Modules\Billing\Models\NullBillType; use Modules\Billing\Models\NullBillType;
use Modules\Media\Models\Media;
use phpOMS\Localization\ISO4217CharEnum; use phpOMS\Localization\ISO4217CharEnum;
/** /**
@ -48,7 +47,7 @@ final class BillTest extends \PHPUnit\Framework\TestCase
self::assertEquals('', $this->bill->info); self::assertEquals('', $this->bill->info);
self::assertInstanceOf('\Modules\Billing\Models\NullBillType', $this->bill->type); self::assertInstanceOf('\Modules\Billing\Models\NullBillType', $this->bill->type);
self::assertInstanceOf('\DateTimeImmutable', $this->bill->createdAt); self::assertInstanceOf('\DateTimeImmutable', $this->bill->createdAt);
self::assertEquals(null, $this->bill->performanceDate); self::assertNull($this->bill->performanceDate);
self::assertNull($this->bill->send); self::assertNull($this->bill->send);
self::assertNull($this->bill->client); self::assertNull($this->bill->client);
self::assertNull($this->bill->supplier); self::assertNull($this->bill->supplier);