mirror of
https://github.com/Karaka-Management/oms-WarehouseManagement.git
synced 2026-01-11 15:18:41 +00:00
bug fixes
This commit is contained in:
parent
0b52f587bd
commit
2f64935f99
2
.github/workflows/greetings.yml
vendored
2
.github/workflows/greetings.yml
vendored
|
|
@ -9,5 +9,5 @@ jobs:
|
|||
- uses: actions/first-interaction@v1
|
||||
with:
|
||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
issue-message: 'Thank you for createing this issue. We will check it as soon as possible.'
|
||||
issue-message: 'Thank you for creating this issue. We will check it as soon as possible.'
|
||||
pr-message: 'Thank you for your pull request. We will check it as soon as possible.'
|
||||
|
|
|
|||
|
|
@ -46,8 +46,6 @@ final class Installer extends InstallerAbstract
|
|||
{
|
||||
parent::install($app, $info, $cfgHandler);
|
||||
|
||||
self::createDefaultStock($app);
|
||||
|
||||
/* Stock types */
|
||||
$fileContent = \file_get_contents(__DIR__ . '/Install/types.json');
|
||||
if ($fileContent === false) {
|
||||
|
|
@ -61,6 +59,8 @@ final class Installer extends InstallerAbstract
|
|||
}
|
||||
|
||||
self::createStockTypes($app, $types);
|
||||
|
||||
self::createDefaultStock($app);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -188,7 +188,8 @@ final class ApiController extends Controller
|
|||
$location->name = $request->getDataString('name') ?? '';
|
||||
$location->stock = new NullStock($request->getDataInt('stock') ?? 1);
|
||||
|
||||
$location->type = $request->hasData('type') ? new NullStockType((int) $request->getDataInt('type')) : null;
|
||||
// @todo Define default type instead of just 1
|
||||
$location->type = new NullStockType($request->getDataInt('type') ?? 1);
|
||||
|
||||
return $location;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,4 +21,6 @@ return ['WarehouseManagement' => [
|
|||
'Shelf' => 'Fach',
|
||||
'Type' => 'Typ',
|
||||
'Location' => 'Lagerplatz',
|
||||
'Quantity' => 'Menge',
|
||||
'All' => 'Alle',
|
||||
]];
|
||||
|
|
|
|||
|
|
@ -21,4 +21,6 @@ return ['WarehouseManagement' => [
|
|||
'Shelf' => 'Shelf',
|
||||
'Type' => 'Type',
|
||||
'Location' => 'Location',
|
||||
'Quantity' => 'Quantity',
|
||||
'All' => 'All',
|
||||
]];
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ echo $this->data['nav']->render(); ?>
|
|||
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<div class="portlet">
|
||||
<section class="portlet">
|
||||
<div class="portlet-head">
|
||||
<?= $this->getHtml('Stocks'); ?>
|
||||
<i class="g-icon download btn end-xs">download</i>
|
||||
|
|
@ -46,6 +46,6 @@ echo $this->data['nav']->render(); ?>
|
|||
<?php endif; ?>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ echo $this->data['nav']->render(); ?>
|
|||
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<div class="portlet">
|
||||
<section class="portlet">
|
||||
<div class="portlet-head"><?= $this->getHtml('Locations'); ?><i class="g-icon download btn end-xs">download</i></div>
|
||||
<div class="slider">
|
||||
<table id="stockList" class="default sticky">
|
||||
|
|
@ -46,6 +46,6 @@ echo $this->data['nav']->render(); ?>
|
|||
<?php endif; ?>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ echo $this->data['nav']->render(); ?>
|
|||
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<div class="portlet">
|
||||
<section class="portlet">
|
||||
<div class="portlet-head">
|
||||
<?= $this->getHtml('Stocks'); ?>
|
||||
<i class="g-icon download btn end-xs">download</i>
|
||||
|
|
@ -46,6 +46,6 @@ echo $this->data['nav']->render(); ?>
|
|||
<?php endif; ?>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user