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

add/fix links and add bill responsibilities

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-03-17 17:17:33 +01:00
parent f8796789db
commit 5285cfc53a
5 changed files with 82 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@
"pid": "/sales/bill",
"type": 3,
"subtype": 1,
"name": "List",
"name": "Open",
"uri": "{/prefix}sales/bill/list",
"target": "self",
"icon": null,
@ -79,7 +79,7 @@
"pid": "/purchase/bill",
"type": 3,
"subtype": 1,
"name": "List",
"name": "Open",
"uri": "{/prefix}purchase/bill/list",
"target": "self",
"icon": null,
@ -211,5 +211,36 @@
"permission": { "permission": 2, "type": null, "element": null },
"parent": 1001602001,
"children": []
},
{
"id": 1005108001,
"pid": "/purchase/analysis",
"type": 3,
"subtype": 1,
"name": "Bill",
"uri": "{/prefix}purchase/analysis/bill",
"target": "self",
"icon": null,
"order": 15,
"from": "Billing",
"permission": { "permission": 2, "type": null, "element": null },
"parent": 1001602001,
"children": []
},
{
"id": 1005109001,
"pid": "/",
"type": 2,
"subtype": 1,
"name": "Billing",
"uri": "{/prefix}private/billing/dashboard?{?}",
"target": "self",
"icon": null,
"order": 5,
"from": "Billing",
"permission": { "permission": 2, "type": null, "element": null },
"parent": 1003401001,
"children": [
]
}
]

45
Admin/Install/db.json
View File

@ -606,5 +606,50 @@
"foreignKey": "editor_doc_id"
}
}
},
"billing_bill_responsible": {
"name": "billing_bill_responsible",
"fields": {
"billing_bill_responsible_id": {
"name": "billing_bill_responsible_id",
"type": "INT",
"null": false,
"primary": true,
"autoincrement": true
},
"billing_bill_responsible_bill": {
"name": "billing_bill_responsible_bill",
"type": "INT",
"null": false,
"foreignTable": "billing_bill",
"foreignKey": "billing_bill_id"
},
"billing_bill_responsible_group": {
"name": "billing_bill_responsible_group",
"type": "INT",
"null": false,
"foreignTable": "group",
"foreignKey": "group_id"
},
"billing_bill_responsible_account": {
"name": "billing_bill_responsible_account",
"type": "INT",
"null": false,
"foreignTable": "account",
"foreignKey": "account_id"
},
"billing_bill_responsible_forwarded_by": {
"name": "billing_bill_responsible_forwarded_by",
"type": "INT",
"null": false,
"foreignTable": "account",
"foreignKey": "account_id"
},
"billing_bill_responsible_forwarded_at": {
"name": "billing_bill_responsible_forwarded_at",
"type": "DATETIME",
"null": false
}
}
}
}

3
Controller/ApiController.php
View File

@ -29,6 +29,7 @@ use Modules\ClientManagement\Models\ClientMapper;
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;
@ -285,7 +286,7 @@ final class ApiController extends Controller
if ($collection === null) {
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
if ($collection instanceof NullMedia) {
if ($collection instanceof NullCollection) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
'/Modules/Media/Files',
$path,

1
Theme/Backend/Lang/Navigation.en.lang.php
View File

@ -13,6 +13,7 @@
declare(strict_types=1);
return ['Navigation' => [
'Open' => 'Open',
'Archive' => 'Archive',
'Bill' => 'Bill',
'Billing' => 'Billing',

2
Theme/Backend/purchase-bill.tpl.php
View File

@ -218,7 +218,7 @@ echo $this->getData('nav')->render(); ?>
<section id="mediaFile" class="portlet">
<div class="portlet-body">
<?php if (!($original instanceof NullMedia)) : ?>
<iframe style="min-height: 600px;" data-form="iUiSettings" data-name="iframeHelper" id="iHelperFrame" src="<?= UriFactory::build('{/backend}Resources/mozilla/Pdf/web/viewer.html{?}&file=' . (($original->isAbsolute ? '' : '/../../../../') . $original->getPath())); ?>" allowfullscreen></iframe>
<iframe style="min-height: 600px;" data-form="iUiSettings" data-name="iframeHelper" id="iHelperFrame" src="<?= UriFactory::build('{/backend}Resources/mozilla/Pdf/web/viewer.html{?}&file=' . \urlencode(($original->isAbsolute ? '' : '/../../../../') . $original->getPath())); ?>" allowfullscreen></iframe>
<?php endif; ?>
</div>
</section>