Multiple Property Bugfix

pHAlkaline · Jan 22, 2024 · a528a0c · a528a0c
1 parent 4270dd6
commit a528a0c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/Controller/FractionsController.php b/app/Controller/FractionsController.php
@@ -93,14 +93,17 @@ public function view($id = null) {
             $this->Flash->error(__('Invalid fraction'));
             $this->redirect(array('action' => 'index', '?' => $this->request->query));
         }
-        $this->Fraction->contain('Manager', 'Comment', 'FractionType');
+        $this->Fraction->contain('Manager', 'Comment', 'FractionType', 'Entity');
         $options = array('conditions' => array('Fraction.id' => $id));
         $fraction = $this->Fraction->find('first', $options);
         $totalDebit = $this->Fraction->Note->sumDebitNotes(null, $id);
         $totalCredit = $this->Fraction->Note->sumCreditNotes(null, $id);
         //$notificationEntities = ClassRegistry::init('Entity')->find('list', array('fields' => array('Entity.email', 'Entity.email'), 'conditions' => array('id' => $fraction['Manager']['id'])));
-        $notificationEntities = $this->Session->read('NotificationEntities')?$this->Session->consume('NotificationEntities'):ClassRegistry::init('Entity')->find('list', array('fields' => array('Entity.email', 'Entity.email'), 'conditions' => array('id' => $fraction['Manager']['id'])));
-
+        $entitiesInFraction = Set::extract('/Entity/id', $fraction);
+        if ($fraction['Fraction']['manager_id']){
+            $entitiesInFraction=[$fraction['Fraction']['manager_id']];
+        }
+        $notificationEntities = $this->Session->read('NotificationEntities')?$this->Session->consume('NotificationEntities'):ClassRegistry::init('Entity')->find('list', array('fields' => array('Entity.email', 'Entity.email'), 'conditions' => array('id' =>  $entitiesInFraction)));
         $emailNotifications = Configure::read('EmailNotifications');
         $this->set(compact('fraction', 'totalDebit', 'totalCredit', 'notificationEntities','emailNotifications'));
         $this->setPhkRequestVar('fraction_id', $id);

diff --git a/app/Locale/ita/LC_MESSAGES/default.po b/app/Locale/ita/LC_MESSAGES/default.po
@@ -2794,7 +2794,6 @@ msgstr "Calcolare"
 msgid "Warning: when a payment advice is generated, ALL PAYMENT ADVICES previously created will be removed, EXCEPT those that have already been paid."
 msgstr "Attenzione: quando viene generato un avviso di pagamento, TUTTI GLI AVVISI DI PAGAMENTO precedentemente creati verranno rimossi, TRANNE quelli già pagati."
 
-
 msgid "Payment Advice"
 msgid_plural "Payment Advices"
 msgstr[0] "Avviso di pagamento"