Jingga/oms-Billing
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Billing.git synced 2026-02-08 12:38:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fixes from the day before

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-03-19 00:02:43 +01:00
parent f7cd53e3ea
commit 26669eeeb0
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin/Install/Media.php
View File

@ -32,14 +32,14 @@ class Media
/**
* Install media providing
*
* @param string $path Module path
* @param ApplicationAbstract $app Application
* @param string $path Module path
*
* @return void
*
* @since 1.0.0
*/
public static function install(string $path, ApplicationAbstract $app) : void
public static function install(ApplicationAbstract $app, string $path) : void
{
$media = \Modules\Media\Admin\Installer::installExternal($app, ['path' => __DIR__ . '/Media.install.json']);

4
Admin/Install/Navigation.install.json
View File

@ -232,8 +232,8 @@
"pid": "/",
"type": 2,
"subtype": 1,
"name": "Billing",
"uri": "{/prefix}private/billing/dashboard?{?}",
"name": "Purchase",
"uri": "{/prefix}private/purchase/billing/dashboard?{?}",
"target": "self",
"icon": null,
"order": 5,

4
Admin/Install/WarehouseManagement.php
View File

@ -31,14 +31,14 @@ class WarehouseManagement
/**
* Install comment relation
*
* @param string $path Module path
* @param ApplicationAbstract $app Application
* @param string $path Module path
*
* @return void
*
* @since 1.0.0
*/
public static function install(string $path, ApplicationAbstract $app) : void
public static function install(ApplicationAbstract $app, string $path) : void
{
$builder = new Builder($app->dbPool->get('schema'));
$builder->alterTable('billing_bill')

17
Controller/ApiController.php
View File

@ -30,14 +30,11 @@ use Modules\ItemManagement\Models\ItemMapper;
use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\NullCollection;
use Modules\Media\Models\NullMedia;
use Modules\Media\Models\PathSettings;
use Modules\Media\Models\UploadStatus;
use Modules\SupplierManagement\Models\NullSupplier;
use Modules\SupplierManagement\Models\SupplierMapper;
use phpOMS\Ai\Ocr\Tesseract\TesseractOcr;
use phpOMS\Autoloader;
use phpOMS\Image\Skew;
use phpOMS\Image\Thresholding;
use phpOMS\Localization\Money;
use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse;
@ -46,10 +43,7 @@ use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation;
use phpOMS\System\SystemUtils;
use phpOMS\Uri\HttpUri;
use phpOMS\Utils\Parser\Pdf\PdfParser;
use phpOMS\Utils\StringUtils;
use phpOMS\Views\View;
/**
@ -182,6 +176,8 @@ final class ApiController extends Controller
->with('mainAddress')
->where('id', (int) $request->getData('client'))
->execute();
} elseif (((int) ($request->getData('supplier') ?? -1)) === 0) {
$account = new NullSupplier();
} elseif ($request->getData('supplier') !== null) {
$account = SupplierMapper::get()
->with('profile')
@ -191,6 +187,7 @@ final class ApiController extends Controller
->execute();
}
/** @var \Modules\Billing\Models\BillType $billType */
$billType = BillTypeMapper::get()->where('id', (int) ($request->getData('type') ?? 1))->execute();
@ -225,7 +222,9 @@ final class ApiController extends Controller
private function validateBillCreate(RequestAbstract $request): array
{
$val = [];
if (($val['client/supplier'] = (empty($request->getData('client')) && empty($request->getData('supplier'))))) {
if (($val['client/supplier'] = (empty($request->getData('client'))
&& (empty($request->getData('supplier')) && ((int) ($request->getData('supplier') ?? -1) !== 0))))
) {
return $val;
}
@ -653,7 +652,7 @@ final class ApiController extends Controller
$billRequest = new HttpRequest(new HttpUri(''));
$billRequest->header->account = $request->header->account;
$billRequest->header->l11n = $request->header->l11n;
$billRequest->setData('supplier', 1); // @todo: make suppleir 1 = unknown supplier
$billRequest->setData('supplier', 0);
$billRequest->setData('status', BillStatus::UNPARSED);
$billRequest->setData('type', $purchaseTransferType->getId());

2
Controller/BackendController.php
View File

@ -261,7 +261,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Billing/Theme/Backend/purchase-bill');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005104001, $request, $response));
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005105001, $request, $response));
$bill = PurchaseBillMapper::get()
->with('elements')