mirror of
https://github.com/Karaka-Management/oms-Billing.git
synced 2026-02-17 16:58:41 +00:00
Automated formatting changes
This commit is contained in:
parent
12e69aedeb
commit
6b978f8a83
|
|
@ -15,9 +15,9 @@ declare(strict_types=1);
|
||||||
namespace Modules\Billing\Admin;
|
namespace Modules\Billing\Admin;
|
||||||
|
|
||||||
use Modules\Billing\Models\BillType;
|
use Modules\Billing\Models\BillType;
|
||||||
use Modules\Billing\Models\BillTypeMapper;
|
|
||||||
use Modules\Billing\Models\BillTypeL11n;
|
use Modules\Billing\Models\BillTypeL11n;
|
||||||
use Modules\Billing\Models\BillTypeL11nMapper;
|
use Modules\Billing\Models\BillTypeL11nMapper;
|
||||||
|
use Modules\Billing\Models\BillTypeMapper;
|
||||||
use phpOMS\Config\SettingsInterface;
|
use phpOMS\Config\SettingsInterface;
|
||||||
use phpOMS\DataStorage\Database\DatabasePool;
|
use phpOMS\DataStorage\Database\DatabasePool;
|
||||||
use phpOMS\Localization\ISO639x1Enum;
|
use phpOMS\Localization\ISO639x1Enum;
|
||||||
|
|
|
||||||
|
|
@ -16,22 +16,19 @@ namespace Modules\Billing\Controller;
|
||||||
|
|
||||||
use Modules\Admin\Models\NullAccount;
|
use Modules\Admin\Models\NullAccount;
|
||||||
use Modules\Billing\Models\Bill;
|
use Modules\Billing\Models\Bill;
|
||||||
use Modules\Billing\Models\BillMapper;
|
|
||||||
use Modules\Billing\Models\BillElement;
|
use Modules\Billing\Models\BillElement;
|
||||||
use Modules\Billing\Models\BillElementMapper;
|
use Modules\Billing\Models\BillElementMapper;
|
||||||
|
use Modules\Billing\Models\BillMapper;
|
||||||
use Modules\Billing\Models\NullBillType;
|
use Modules\Billing\Models\NullBillType;
|
||||||
|
use Modules\ClientManagement\Models\ClientMapper;
|
||||||
use Modules\ClientManagement\Models\NullClient;
|
use Modules\ClientManagement\Models\NullClient;
|
||||||
use phpOMS\Message\Http\HttpRequest;
|
use Modules\ItemManagement\Models\ItemMapper;
|
||||||
use phpOMS\Message\Http\HttpResponse;
|
use phpOMS\Localization\Money;
|
||||||
use phpOMS\Message\Http\RequestStatusCode;
|
use phpOMS\Message\Http\RequestStatusCode;
|
||||||
use phpOMS\Message\NotificationLevel;
|
use phpOMS\Message\NotificationLevel;
|
||||||
use phpOMS\Message\RequestAbstract;
|
use phpOMS\Message\RequestAbstract;
|
||||||
use phpOMS\Message\ResponseAbstract;
|
use phpOMS\Message\ResponseAbstract;
|
||||||
use phpOMS\Model\Message\FormValidation;
|
use phpOMS\Model\Message\FormValidation;
|
||||||
use phpOMS\Utils\Parser\Markdown\Markdown;
|
|
||||||
use Modules\ItemManagement\Models\ItemMapper;
|
|
||||||
use phpOMS\Localization\Money;
|
|
||||||
use Modules\ClientManagement\Models\ClientMapper;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Billing class.
|
* Billing class.
|
||||||
|
|
|
||||||
|
|
@ -15,13 +15,11 @@ declare(strict_types=1);
|
||||||
namespace Modules\Billing\Controller;
|
namespace Modules\Billing\Controller;
|
||||||
|
|
||||||
use Modules\Billing\Models\BillMapper;
|
use Modules\Billing\Models\BillMapper;
|
||||||
|
use Modules\Billing\Models\BillTypeL11n;
|
||||||
use phpOMS\Contract\RenderableInterface;
|
use phpOMS\Contract\RenderableInterface;
|
||||||
use phpOMS\Message\RequestAbstract;
|
use phpOMS\Message\RequestAbstract;
|
||||||
use phpOMS\Message\ResponseAbstract;
|
use phpOMS\Message\ResponseAbstract;
|
||||||
use phpOMS\Views\View;
|
use phpOMS\Views\View;
|
||||||
use Modules\Billing\Models\BillType;
|
|
||||||
use Modules\Billing\Models\BillTypeL11n;
|
|
||||||
use phpOMS\DataStorage\Database\RelationType;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Billing class.
|
* Billing class.
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,9 @@ class Bill implements \JsonSerializable
|
||||||
* @var int|BillType
|
* @var int|BillType
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
public int|BillType $type = 0;
|
public int |
|
||||||
|
|
||||||
|
BillType $type = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Bill status.
|
* Bill status.
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace Modules\Billing\Models;
|
namespace Modules\Billing\Models;
|
||||||
|
|
||||||
use Modules\ClientManagement\Models\ClientMapper;
|
|
||||||
use phpOMS\DataStorage\Database\DataMapperAbstract;
|
use phpOMS\DataStorage\Database\DataMapperAbstract;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,9 @@ use Modules\Admin\Models\AccountMapper;
|
||||||
use Modules\ClientManagement\Models\ClientMapper;
|
use Modules\ClientManagement\Models\ClientMapper;
|
||||||
use phpOMS\DataStorage\Database\DataMapperAbstract;
|
use phpOMS\DataStorage\Database\DataMapperAbstract;
|
||||||
use phpOMS\DataStorage\Database\Query\Builder;
|
use phpOMS\DataStorage\Database\Query\Builder;
|
||||||
use phpOMS\Localization\Money;
|
|
||||||
use phpOMS\DataStorage\Database\RelationType;
|
use phpOMS\DataStorage\Database\RelationType;
|
||||||
use phpOMS\Localization\Defaults\CountryMapper;
|
use phpOMS\Localization\Defaults\CountryMapper;
|
||||||
|
use phpOMS\Localization\Money;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mapper class.
|
* Mapper class.
|
||||||
|
|
@ -221,12 +221,10 @@ final class BillMapper extends DataMapperAbstract
|
||||||
|
|
||||||
public static function getItemRetentionRate(int $id, \DateTime $start, \DateTime $end) : float
|
public static function getItemRetentionRate(int $id, \DateTime $start, \DateTime $end) : float
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getItemLivetimeValue(int $id, \DateTime $start, \DateTime $end) : Money
|
public static function getItemLivetimeValue(int $id, \DateTime $start, \DateTime $end) : Money
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getNewestItemInvoices(int $id, int $limit = 10) : array
|
public static function getNewestItemInvoices(int $id, int $limit = 10) : array
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,12 @@ use phpOMS\Stdlib\Base\Enum;
|
||||||
abstract class BillStatus extends Enum
|
abstract class BillStatus extends Enum
|
||||||
{
|
{
|
||||||
public const ACTIVE = 1;
|
public const ACTIVE = 1;
|
||||||
|
|
||||||
public const ARCHIVED = 2;
|
public const ARCHIVED = 2;
|
||||||
|
|
||||||
public const DELETED = 4;
|
public const DELETED = 4;
|
||||||
|
|
||||||
public const DONE = 8;
|
public const DONE = 8;
|
||||||
|
|
||||||
public const DRAFT = 16;
|
public const DRAFT = 16;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,9 @@ class BillTypeL11n implements \JsonSerializable, ArrayableInterface
|
||||||
* @var int
|
* @var int
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
protected int|BillType $type = 0;
|
protected int |
|
||||||
|
|
||||||
|
BillType $type = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Language.
|
* Language.
|
||||||
|
|
|
||||||
|
|
@ -27,5 +27,6 @@ use phpOMS\Stdlib\Base\Enum;
|
||||||
abstract class PermissionState extends Enum
|
abstract class PermissionState extends Enum
|
||||||
{
|
{
|
||||||
public const SALES_INVOICE = 1;
|
public const SALES_INVOICE = 1;
|
||||||
|
|
||||||
public const PURCHASE_INVOICE = 2;
|
public const PURCHASE_INVOICE = 2;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,6 @@
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
|
||||||
$footerView = new \phpOMS\Views\PaginationView($this->l11nManager, $this->request, $this->response);
|
$footerView = new \phpOMS\Views\PaginationView($this->l11nManager, $this->request, $this->response);
|
||||||
$footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');
|
$footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');
|
||||||
$footerView->setPages(20);
|
$footerView->setPages(20);
|
||||||
|
|
|
||||||
|
|
@ -153,7 +153,7 @@ echo $this->getData('nav')->render(); ?>
|
||||||
<td><i class="fa fa-plus add"></i> <i class="fa fa-chevron-up order-up"></i> <i class="fa fa-chevron-down order-down"></i>
|
<td><i class="fa fa-plus add"></i> <i class="fa fa-chevron-up order-up"></i> <i class="fa fa-chevron-down order-down"></i>
|
||||||
<td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" value="<?= $element->itemNumber; ?>" required></span>
|
<td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" value="<?= $element->itemNumber; ?>" required></span>
|
||||||
<td><textarea required><?= $element->itemName; ?></textarea>
|
<td><textarea required><?= $element->itemName; ?></textarea>
|
||||||
<td><input type="number" min="0" value="<?= $element->quantity ?>" required>
|
<td><input type="number" min="0" value="<?= $element->quantity; ?>" required>
|
||||||
<td><input type="text" value="<?= $element->singleSalesPriceNet->getCurrency(); ?>">
|
<td><input type="text" value="<?= $element->singleSalesPriceNet->getCurrency(); ?>">
|
||||||
<td><input type="number" min="0">
|
<td><input type="number" min="0">
|
||||||
<td><input type="number" min="0" max="100" step="any">
|
<td><input type="number" min="0" max="100" step="any">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user