Bugfix: removing payment monthly returns incorrect template data

Volmarg · Jun 20, 2021 · fa45d3e · fa45d3e
1 parent c7f29f6
commit fa45d3e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/src/Action/Modules/Payments/MyPaymentsMonthlyAction.php b/src/Action/Modules/Payments/MyPaymentsMonthlyAction.php
@@ -28,6 +28,8 @@
  */
 class MyPaymentsMonthlyAction extends AbstractController {
 
+    const KEY_CURRENT_ACTIVE_YEAR = "currentActiveYear";
+
     /**
      * @var Application $app
      */
@@ -143,10 +145,11 @@ public function remove(Request $request): Response
             $request->request->get('id')
         );
 
-        $message = $response->getContent();
+        $message           = $response->getContent();
+        $currentActiveYear = $request->request->get(self::KEY_CURRENT_ACTIVE_YEAR);
 
         if ($response->getStatusCode() == 200) {
-            $renderedTemplate = $this->renderTemplate(true, true);
+            $renderedTemplate = $this->renderTemplate($currentActiveYear, true, true);
             $templateContent  = $renderedTemplate->getContent();
 
             return AjaxResponse::buildJsonResponseForAjaxCall(200, $message, $templateContent);

diff --git a/src/assets/scripts/core/ui/DataProcessor/Entity.ts b/src/assets/scripts/core/ui/DataProcessor/Entity.ts
@@ -206,7 +206,7 @@ export default class Entity extends AbstractDataProcessor {
                     'id'            : $(paymentType).val(),
                 },
             };
-            
+
             let dataProcessorsDto            = new DataProcessorDto();
             dataProcessorsDto.url            = url;
             dataProcessorsDto.successMessage = successMessage;
@@ -217,12 +217,14 @@ export default class Entity extends AbstractDataProcessor {
             return dataProcessorsDto;
         },
         makeRemoveData($baseElement?: JQuery<HTMLElement>): DataProcessorDto | null {
-            let id              = $($baseElement).find('.id').html();
-            let url             = '/my-payments-monthly/remove/';
-            let successMessage  = AbstractDataProcessor.messages.entityRemoveSuccess(Entity.MyPaymentsMonthly.processorName);
-            let failMessage     = AbstractDataProcessor.messages.entityRemoveFail(Entity.MyPaymentsMonthly.processorName);
-            let ajaxData        = {
-                id: id
+            let id                = $($baseElement).find('.id').html();
+            let url               = '/my-payments-monthly/remove/';
+            let currentActiveYear = $("#MyPaymentsMonthlyModuleBody .active-year").text().trim();
+            let successMessage    = AbstractDataProcessor.messages.entityRemoveSuccess(Entity.MyPaymentsMonthly.processorName);
+            let failMessage       = AbstractDataProcessor.messages.entityRemoveFail(Entity.MyPaymentsMonthly.processorName);
+            let ajaxData          = {
+                id                : id,
+                currentActiveYear : currentActiveYear
             };
 
             let dataProcessorsDto            = new DataProcessorDto();
@@ -547,7 +549,7 @@ export default class Entity extends AbstractDataProcessor {
                 'information'   : information,
                 'id'            : id,
             };
-            
+
             let dataProcessorsDto            = new DataProcessorDto();
             dataProcessorsDto.url            = url;
             dataProcessorsDto.successMessage = successMessage;
@@ -562,7 +564,7 @@ export default class Entity extends AbstractDataProcessor {
             let url            = '/my-job/holidays/remove/';
             let failMessage    = AbstractDataProcessor.messages.entityRemoveFail(Entity.MyJobHolidays.processorName);
             let successMessage = AbstractDataProcessor.messages.entityRemoveSuccess(Entity.MyJobHolidays.processorName);
-            
+
             let ajaxData       = {
                 id: id
             };

diff --git a/templates/modules/my-payments/monthly.html.twig b/templates/modules/my-payments/monthly.html.twig
@@ -25,7 +25,7 @@
                             <section class="mB-20">
                                 {% for year in years %}
                                     <a href="{{ path("my-payments-monthly", {"year" : year}) }}" class="ajax-content-load">
-                                        <button class="trigger-custom btn cur-p {{ (active_year == year ? 'btn-primary' : 'btn-outline-primary') }}">
+                                        <button class="trigger-custom btn cur-p {{ (active_year == year ? 'btn-primary active-year' : 'btn-outline-primary') }}">
                                             {{ year }}
                                         </button>
                                     </a>