Merge branch 'Logi-flesserke-delete-button'

LitusProject · Sep 30, 2024 · a5b4ae7 · a5b4ae7
2 parents 2b5e406 + 2e799dd
commit a5b4ae7
Show file tree

Hide file tree

Showing 7 changed files with 94 additions and 2 deletions.
diff --git a/module/LogisticsBundle/Controller/FlesserkeArticleController.php b/module/LogisticsBundle/Controller/FlesserkeArticleController.php
@@ -143,6 +143,25 @@ public function editAction(): ViewModel
         );
     }
 
+    public function deleteAction()
+    {
+        $this->initAjax();
+
+        $article = $this->getFlesserkeArticleEntity();
+        if ($article === null) {
+            return new ViewModel();
+        }
+
+        $this->getEntityManager()->remove($article);
+        $this->getEntityManager()->flush();
+
+        return new ViewModel(
+            array(
+                'result' => (object) array('status' => 'success'),
+            )
+        );
+    }
+
     public function searchAction(): ViewModel
     {
         $this->initAjax();

diff --git a/module/LogisticsBundle/Controller/InventoryArticleController.php b/module/LogisticsBundle/Controller/InventoryArticleController.php
@@ -384,6 +384,25 @@ public function editArticlesAction(): ViewModel
         );
     }
 
+    public function deleteAction()
+    {
+        $this->initAjax();
+
+        $article = $this->getInventoryArticleEntity();
+        if ($article === null) {
+            return new ViewModel();
+        }
+
+        $this->getEntityManager()->remove($article);
+        $this->getEntityManager()->flush();
+
+        return new ViewModel(
+            array(
+                'result' => (object) array('status' => 'success'),
+            )
+        );
+    }
+
     public function searchArticlesAction(): ViewModel
     {
         $this->initAjax();

diff --git a/module/LogisticsBundle/Resources/config/install/acl.config.php b/module/LogisticsBundle/Resources/config/install/acl.config.php
@@ -51,10 +51,10 @@
             'index', 'view', 'add', 'edit', 'cancel', 'remove',
         ),
         'logistics_inventory_article' => array(
-            'index', 'add', 'edit', 'search', 'addArticles', 'editArticles', 'searchArticles',
+            'index', 'add', 'delete', 'edit', 'search', 'addArticles', 'editArticles', 'searchArticles',
         ),
         'logistics_flesserke_article' => array(
-            'index', 'add', 'edit', 'search', 'addArticles', 'editArticles', 'searchArticles',
+            'index', 'add', 'delete', 'edit', 'search', 'addArticles', 'editArticles', 'searchArticles',
         ),
     ),
 );
diff --git a/module/LogisticsBundle/Resources/views/logistics/flesserke-article/delete.twig b/module/LogisticsBundle/Resources/views/logistics/flesserke-article/delete.twig
@@ -0,0 +1,3 @@
+{% autoescape false %}
+    {{ result|json_encode }}
+{% endautoescape %}
diff --git a/module/LogisticsBundle/Resources/views/logistics/flesserke-article/index.twig b/module/LogisticsBundle/Resources/views/logistics/flesserke-article/index.twig
@@ -119,6 +119,9 @@
                                         <a href="{{ url('logistics_flesserke_article', {"action" : 'edit', "article" : article.getId()}) }}" class="btn btn-warning btn-xs">
                                             {{ translate('Edit') }}
                                         </a>
+                                        <a href="{{ url('logistics_flesserke_article', {"action" : 'delete', "article" : article.getId()}) }}" class="btn btn-warning btn-xs delete-article">
+                                            {{ translate('Delete') }}
+                                        </a>
                                     </td>
                                 {% endif %}
                             </tr>
@@ -152,6 +155,25 @@
         $(document).ready(function () {
             $('.category-collapse').click(collapse);
 
+            $('.delete-article').click(function (e) {
+                e.preventDefault();
+                const url = $(this).attr('href');
+
+                if (confirm('{{ translate('Are you sure you want to delete this article?') }}')) {
+                    $.ajax({
+                        url: url,
+                        type: 'DELETE',
+                        success: function (result) {
+                            alert('{{ translate('Article deleted successfully.') }}');
+                            location.reload();
+                        },
+                        error: function (xhr, status, error) {
+                            alert('{{ translate('An error occurred while deleting the article.') }}');
+                        }
+                    });
+                }
+            });
+
             $('a[rel=popover], span[rel=popover]').popover({'trigger': 'hover', 'html': true});
 
             {% if hasAccess('logistics_flesserke_article', 'search') %}

diff --git a/module/LogisticsBundle/Resources/views/logistics/inventory-article/delete.twig b/module/LogisticsBundle/Resources/views/logistics/inventory-article/delete.twig
@@ -0,0 +1,3 @@
+{% autoescape false %}
+    {{ result|json_encode }}
+{% endautoescape %}
diff --git a/module/LogisticsBundle/Resources/views/logistics/inventory-article/index.twig b/module/LogisticsBundle/Resources/views/logistics/inventory-article/index.twig
@@ -126,6 +126,9 @@
                                                 <a href="{{ url('logistics_inventory_article', {"action" : 'edit', "article" : article.getId()}) }}" class="btn btn-warning btn-xs">
                                                     {{ translate('Edit') }}
                                                 </a>
+                                                <a href="{{ url('logistics_inventory_article', {"action" : 'delete', "article" : article.getId()}) }}" class="btn btn-warning btn-xs">
+                                                    {{ translate('Delete') }}
+                                                </a>
                                             </td>
                                         {% endif %}
                                     </tr>
@@ -161,6 +164,9 @@
                                             <a href="{{ url('logistics_inventory_article', {"action" : 'edit', "article" : article.getId()}) }}" class="btn btn-warning btn-xs">
                                                 {{ translate('Edit') }}
                                             </a>
+                                            <a href="{{ url('logistics_inventory_article', {"action" : 'delete', "article" : article.getId()}) }}" class="btn btn-warning btn-xs delete-article">
+                                                {{ translate('Delete') }}
+                                            </a>
                                         </td>
                                     {% endif %}
                                 </tr>
@@ -197,6 +203,25 @@
 
             $('a[rel=popover], span[rel=popover]').popover({'trigger': 'hover', 'html': true});
 
+            $('.delete-article').click(function (e) {
+                e.preventDefault();
+                const url = $(this).attr('href');
+
+                if (confirm('{{ translate('Are you sure you want to delete this article?') }}')) {
+                    $.ajax({
+                        url: url,
+                        type: 'DELETE',
+                        success: function (result) {
+                            alert('{{ translate('Article deleted successfully.') }}');
+                            location.reload();
+                        },
+                        error: function (xhr, status, error) {
+                            alert('{{ translate('An error occurred while deleting the article.') }}');
+                        }
+                    });
+                }
+            });
+
             {% if hasAccess('logistics_inventory_article', 'search') %}
                 $.searchDatabase({
                     defaultPage:    $('#default_page'),
@@ -249,6 +274,7 @@
                     }
                 });
             {% endif %}
+
         });
 
         function openSearchRequest(e) {