-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Added view page for inventory batches
- added changes regarding navigation around inventory and inventory batches - updated layout on inventory batch pages
- Loading branch information
Showing
11 changed files
with
175 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...Marello/Bundle/InventoryBundle/Resources/views/Inventory/Datagrid/manageBatches.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <div class="marello-line-item-related-field"> | ||
| <a href="{{ path('marello_inventory_inventorylevel_manage_batches', {'id': record.getValue('id')}) }}"> | ||
| {{ 'marello.inventory.inventorylevel.form.manage_batches.label'|trans }} | ||
| <a href="{{ path('marello_inventory_inventorylevel_batches_view', {'id': record.getValue('id')}) }}"> | ||
| {{ 'marello.inventory.inventorylevel.grid.view_batches.label'|trans }} | ||
| </a> | ||
| </div> |
85 changes: 85 additions & 0 deletions
85
src/Marello/Bundle/InventoryBundle/Resources/views/InventoryLevel/batchesView.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| {% extends 'OroUIBundle:actions:view.html.twig' %} | ||
| {% import 'OroUIBundle::macros.html.twig' as UI %} | ||
| {% import 'OroDataGridBundle::macros.html.twig' as dataGrid %} | ||
|
|
||
| {% block navButtons %} | ||
| {{ UI.cancelButton(path('marello_inventory_inventory_view', { 'id': entity.inventoryItem.id }), 'Back'|trans) }} | ||
| {% if is_granted('EDIT', entity) %} | ||
| {{ UI.editButton({ | ||
| 'path' : path('marello_inventory_inventorylevel_manage_batches', { id: entity.id }), | ||
| 'entity_label': 'marello.inventory.inventorybatch.entity_label'|trans | ||
| }) }} | ||
| {% endif %} | ||
| {% endblock navButtons %} | ||
|
|
||
| {% block pageHeader %} | ||
| {% set breadcrumbs = { | ||
| 'entity': form.vars.value, | ||
| 'indexPath': path('marello_inventory_inventory_index'), | ||
| 'indexLabel': 'marello.inventory.label'|trans, | ||
| 'entityTitle': 'marello.inventory.inventorybatch.entity_plural_label'|trans, | ||
| 'additional': [{ | ||
| 'indexPath': path('marello_inventory_inventory_view', {'id': entity.inventoryItem.id}), | ||
| 'indexLabel': entity.inventoryItem.product.sku | ||
| }] | ||
| } %} | ||
| {{ parent() }} | ||
| {% endblock pageHeader %} | ||
|
|
||
| {% block content_data %} | ||
| {% set id = 'marello-inventory-batches-view' %} | ||
| {% set generalSubblocks = [] %} | ||
|
|
||
| {% set productInformationWidget %} | ||
| <div class="widget-content"> | ||
| <div class="row-fluid form-horizontal"> | ||
| <div class="responsive-block"> | ||
| <div class="box-type1"> | ||
| {{ oro_widget_render({ | ||
| 'widgetType': 'block', | ||
| 'url': path('marello_inventory_widget_info', {id: entity.inventoryItem.id}), | ||
| 'title': 'marello.product.product_information'|trans | ||
| }) }} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {% endset %} | ||
| {% set generalSubblocks = generalSubblocks|merge([{'data' : [productInformationWidget] }]) %} | ||
|
|
||
| {% set inventoryLevelInformationWidget %} | ||
| <div class="responsive-block"> | ||
| <div class="box-type1"> | ||
| <div class="title"> | ||
| <span class="widget-title">{{ 'marello.inventory.information.label'|trans }}</span> | ||
| </div> | ||
| {{ UI.renderProperty('marello.inventory.inventorylevel.warehouse.label'|trans, entity.warehouse.label) }} | ||
| {{ UI.renderProperty('marello.inventory.inventorylevel.pick_location.label'|trans, entity.picklocation) }} | ||
| {{ UI.renderProperty('marello.inventory.inventorylevel.inventory.label'|trans, entity.inventoryQty) }} | ||
| </div> | ||
| </div> | ||
| {% endset %} | ||
| {% set generalSubblocks = generalSubblocks|merge([{'data' : [inventoryLevelInformationWidget]}]) %} | ||
|
|
||
| {% set dataBlocks = [ | ||
| { | ||
| 'title': 'General Information'|trans, | ||
| 'class': 'active', | ||
| 'subblocks': generalSubblocks | ||
| } | ||
| ] %} | ||
|
|
||
| {% set dataBlocks = dataBlocks|merge([{ | ||
| 'title' : 'marello.inventory.inventorybatch.entity_plural_label'|trans, | ||
| 'subblocks': [{ | ||
| 'title' : null, | ||
| 'data' : [ | ||
| dataGrid.renderGrid('marello-inventory-batches', {'inventoryLevelId': entity.id}) | ||
| ] | ||
| }] | ||
| }]) | ||
| %} | ||
|
|
||
| {% set data = { 'dataBlocks': dataBlocks } %} | ||
| {{ parent() }} | ||
| {% endblock content_data %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,7 +42,7 @@ | |
| } | ||
|
|
||
| .marello-line-item-related-field { | ||
| margin: 5px 0 0 5px; | ||
| margin: 0 0 0 5px; | ||
| float:left; | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters