general fixes

This commit is contained in:
Dennis Eichhorn 2024-04-19 02:08:38 +00:00
parent a0a4518ebe
commit 15d96f8da9
4 changed files with 11 additions and 9 deletions

View File

@ -30,7 +30,7 @@ return [
],
],
],
'^/warehouse/stock/view(\?.*)?$' => [
'^/warehouse/stock/view(\?.*$|$)' => [
[
'dest' => '\Modules\WarehouseManagement\Controller\BackendController:viewStock',
'verb' => RouteVerb::GET,
@ -42,7 +42,7 @@ return [
],
],
],
'^/warehouse/stock/create(\?.*)?$' => [
'^/warehouse/stock/create(\?.*$|$)' => [
[
'dest' => '\Modules\WarehouseManagement\Controller\BackendController:viewStockCreate',
'verb' => RouteVerb::GET,
@ -66,7 +66,7 @@ return [
],
],
],
'^/warehouse/stock/type/view(\?.*)?$' => [
'^/warehouse/stock/type/view(\?.*$|$)' => [
[
'dest' => '\Modules\WarehouseManagement\Controller\BackendController:viewStockType',
'verb' => RouteVerb::GET,
@ -78,7 +78,7 @@ return [
],
],
],
'^/warehouse/stock/type/create(\?.*)?$' => [
'^/warehouse/stock/type/create(\?.*$|$)' => [
[
'dest' => '\Modules\WarehouseManagement\Controller\BackendController:viewStockTypeCreate',
'verb' => RouteVerb::GET,
@ -102,7 +102,7 @@ return [
],
],
],
'^/warehouse/stock/location/view(\?.*)?$' => [
'^/warehouse/stock/location/view(\?.*$|$)' => [
[
'dest' => '\Modules\WarehouseManagement\Controller\BackendController:viewStockLocation',
'verb' => RouteVerb::GET,
@ -114,7 +114,7 @@ return [
],
],
],
'^/warehouse/stock/location/create(\?.*)?$' => [
'^/warehouse/stock/location/create(\?.*$|$)' => [
[
'dest' => '\Modules\WarehouseManagement\Controller\BackendController:viewStockLocationCreate',
'verb' => RouteVerb::GET,

View File

@ -21,6 +21,7 @@ use Modules\Billing\Models\BillTransferType;
use Modules\ClientManagement\Models\NullClient;
use Modules\ItemManagement\Models\StockIdentifierType;
use Modules\SupplierManagement\Models\NullSupplier;
use Modules\WarehouseManagement\Models\NullStock;
use Modules\WarehouseManagement\Models\NullStockType;
use Modules\WarehouseManagement\Models\Stock;
use Modules\WarehouseManagement\Models\StockDistribution;
@ -185,7 +186,7 @@ final class ApiController extends Controller
{
$location = new StockLocation();
$location->name = $request->getDataString('name') ?? '';
$location->stock = $request->getDataInt('stock') ?? 1;
$location->stock = new NullStock($request->getDataInt('stock') ?? 1);
$location->type = $request->hasData('type') ? new NullStockType((int) $request->getDataInt('type')) : null;

View File

@ -34,7 +34,7 @@ class StockLocation
public string $name = '';
public int | Stock $stock = 0;
public Stock $stock;
public ?StockType $type = null;
@ -56,5 +56,6 @@ class StockLocation
public function __construct(string $name = '')
{
$this->name = $name;
$this->stock = new NullStock();
}
}

View File

@ -34,7 +34,7 @@ echo $this->data['nav']->render();
<div class="form-group">
<label for="iLocationStock"><?= $this->getHtml('Stock'); ?></label>
<input type="text" id="iLocationStock" name="stock" value="<?= $location->stock; ?>"<?= $isNew ? ' required' : ' disabled'; ?>>
<input type="text" id="iLocationStock" name="stock" value="<?= $location->stock->id; ?>"<?= $isNew ? ' required' : ' disabled'; ?>>
</div>
<div class="form-group">