Merge pull request #20 from Endereco/S5P-13-falsche-doaccountings-ums…

…etzung S5P-13: falsche doaccountings umsetzung
Endereco · May 10, 2021 · d002e59 · d002e59
2 parents 27a7e07 + 3125878
commit d002e59
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 16 deletions.
diff --git a/Subscriber/Frontend.php b/Subscriber/Frontend.php
@@ -55,19 +55,40 @@ public static function getSubscribedEvents()
 		return [
 			'Theme_Inheritance_Template_Directories_Collected' => 'onCollectTemplateDir',
 
-            'Shopware\Models\Customer\Address::postPersist' => 'onPostPersist',
-            'Shopware\Models\Customer\Address::postUpdate' => 'onPostUpdate',
-
             'Enlight_Controller_Action_PostDispatchSecure_Frontend' => 'onPostDispatch',
             'Enlight_Controller_Action_PostDispatchSecure_Backend_Config' => 'onPostDispatchConfig',
 
+            'Enlight_Controller_Action_PostDispatchSecure_Frontend_Register' => 'sendDoAccountingRegister',
+            'Enlight_Controller_Action_PostDispatchSecure_Frontend_Address' => 'sendDoAccountingAddress',
+            'Enlight_Controller_Action_PostDispatchSecure_Frontend_Forms' => 'sendDoAccountingForms',
+
             'Enlight_Controller_Action_PostDispatchSecure_Frontend_Account' => 'checkExistingCustomerAddresses',
             'Enlight_Controller_Action_PostDispatchSecure_Frontend_Checkout' => 'checkAdressesOrOpenModals',
 
             'Shopware_Modules_Order_SaveOrder_FilterAttributes' => 'onAfterOrderSaveOrder',
 		];
 	}
 
+    public function sendDoAccountingForms($args) {
+        $this->_doAccounting();
+    }
+
+    public function sendDoAccountingRegister($args) {
+        $request = $args->getRequest();
+        $blackListActions = [
+            'ajax_validate_password',
+            'ajax_validate_email'
+        ];
+        if (in_array($request->getActionName(), $blackListActions)) {
+            return;
+        }
+        $this->_doAccounting();
+    }
+
+	public function sendDoAccountingAddress($args) {
+	    $this->_doAccounting();
+    }
+
 	public function onAfterOrderSaveOrder($args) {
         $sOrder = $args->get('subject');
         $returnValue = $args->getReturn();
@@ -239,18 +260,6 @@ public function checkExistingCustomerAddresses($args) {
         }
     }
 
-	public function onPostPersist($args) {
-        $this->_doAccounting();
-    }
-
-    public function onPostUpdate($args) {
-        $this->_doAccounting();
-    }
-
-    public function onPreRemove($args) {
-        $this->_doAccounting();
-    }
-
     public function onPostDispatchConfig(\Enlight_Event_EventArgs $args)
     {
         /** @var Shopware_Controllers_Backend_Config $subject */

diff --git a/plugin.xml b/plugin.xml
@@ -5,7 +5,7 @@
     <label lang="en">Endereco Address-Services for Shopware (Download)</label>
     <label lang="de">Endereco Adress-Services für Shopware (Download)</label>
 
-    <version>3.5.5</version>
+    <version>3.5.6</version>
 
     <link>https://www.endereco.de/shopware</link>
 
@@ -31,6 +31,23 @@
 
     <logo>/custom/plugins/EnderecoShopware5Client/logo.png</logo>
 
+    <changelog version="3.5.6">
+        <changes lang="de">
+            <![CDATA[
+            <ul>
+                <li><a href="https://github.com/Endereco/endereco-shopware5-client/issues/19">Issue #19</a> Fix für "Falsche doAccounting Umsetzung".</li>
+            </ul>
+        ]]>
+        </changes>
+        <changes lang="en">
+            <![CDATA[
+            <ul>
+                <li><a href="https://github.com/Endereco/endereco-shopware5-client/issues/19">Issue #19</a> Fix for "Wrong doAccounting implementation".</li>
+            </ul>
+        ]]>
+        </changes>
+    </changelog>
+
     <changelog version="3.5.5">
         <changes lang="de">
             <![CDATA[