Update 1.1.4

PH2M · Feb 21, 2019 · 54b9bdc · 54b9bdc
1 parent c0d9fa1
commit 54b9bdc
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -12,3 +12,13 @@ phpcsfixer_dry_run: ## Return an error code if PHP errors codes
 	./vendor/bin/php-cs-fixer fix --verbose --show-progress dots --dry-run
 phpcsfixer_fix: ## Fix PHP Coding styles (need composer install (dev) first)
 	./vendor/bin/php-cs-fixer fix --verbose --show-progress dots
+docker_phpcsfixer_dry_run: ## Return an error code if PHP errors codes WITH DOCKER
+	docker run --rm \
+		--user $(id -u):$(id -g) \
+		--volume ${PWD}:/project \
+		herloct/php-cs-fixer fix --verbose --show-progress dots --dry-run
+docker_phpcsfixer_fix: ## Fix PHP Coding styles (need composer install (dev) first) WITH DOCKER
+	docker run --rm \
+        --user $(id -u):$(id -g) \
+        --volume ${PWD}:/project \
+        herloct/php-cs-fixer fix --verbose --show-progress dots
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
@@ -45,4 +45,14 @@ Init module :
 - [Update] update tarteaucitron to v1.1
 - [Fix] fix node name in xml layout file
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+==== 1.1.4 ====
+
+- [Fix] Show message after logout redirect
+- [Fix] Bad email file path
+- [Fix] Add cron expression for queue
+- [Fix] Remove useless config > system depends useless
+- [Update] Add custom dispatch event for check queue event condition
+- [Feature] Add docker run alternative for phpcsfixer
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/app/code/community/PH2M/Gdpr/Model/Customer/Data/Remove.php b/app/code/community/PH2M/Gdpr/Model/Customer/Data/Remove.php
@@ -53,6 +53,7 @@ public function requestDeleteCustomerData($customer)
             if (Mage::getStoreConfig('phgdpr/customer_data_remove/enable_remove_from_newsletter')) {
                 $subscriber = Mage::getModel('newsletter/subscriber')->loadByEmail($customerEmail);
                 if ($subscriber->getId()) {
+                    $subscriber->setImportMode(true);
                     $subscriber->unsubscribe();
                 }
             }
@@ -126,9 +127,13 @@ protected function deleteCustomerAccount($customer)
         }
         try {
             // Disable Secure area for force customer delete from front area
-            Mage::register('isSecureArea', true);
-            $customer->delete();
-            Mage::register('isSecureArea', false);
+            if (!Mage::registry('isSecureArea')) {
+                Mage::register('isSecureArea', true);
+                $customer->delete();
+                Mage::unregister('isSecureArea');
+            } else {
+                $customer->delete();
+            }
         } catch (Exception $e) {
             Mage::logException($e);
             Mage::helper('phgdpr')->log($e->getMessage(), Zend_Log::ERR);
@@ -170,6 +175,7 @@ protected function deleteCustomerNewsletterSubscription($customerEmail)
         $subscriber = Mage::getModel('newsletter/subscriber')->loadByEmail($customerEmail);
         if ($subscriber->getId()) {
             try {
+                $subscriber->setImportMode(true);
                 $subscriber->unsubscribe();
                 $subscriber->delete();
             } catch (Exception $e) {

diff --git a/app/code/community/PH2M/Gdpr/Model/Observer.php b/app/code/community/PH2M/Gdpr/Model/Observer.php
@@ -91,7 +91,9 @@ public function runQueueRunner()
         }
         foreach ($entities as $entity) {
             $action = Mage::getModel($entity->getEntityType());
-            if ($action) {
+            $action->setRun(true);
+            Mage::dispatchEvent('gdpr_queue_run_before', ['action' => $action, 'entity' => $entity]);
+            if ($action && ($action->getRun() == true)) {
                 try {
                     $action->run($entity->getParams());
                     $entity->delete();

diff --git a/app/code/community/PH2M/Gdpr/controllers/CustomerController.php b/app/code/community/PH2M/Gdpr/controllers/CustomerController.php
@@ -106,12 +106,14 @@ public function deleteAccountAction()
 
         Mage::getModel('phgdpr/customer_data_remove')->requestDeleteCustomerData($customer);
 
-        Mage::getSingleton('customer/session')->logout();
+        $session = Mage::getSingleton('customer/session');
+        $session->logout();
+        $session->renewSession();
         if (!Mage::getStoreConfig('phgdpr/customer_data_remove/remove_action_in_queue')) {
-            Mage::getSingleton('core/session')->clear();
-            Mage::getSingleton('core/session')->addSuccess(Mage::getStoreConfig(('phgdpr/customer_data_remove/account_delete_success_message')));
+            $session->addSuccess(Mage::getStoreConfig(('phgdpr/customer_data_remove/account_delete_success_message')));
+        } else {
+            $session->addSuccess(Mage::getStoreConfig(('phgdpr/customer_data_remove/account_delete_queue_pending_message')));
         }
-        Mage::getSingleton('core/session')->addSuccess(Mage::getStoreConfig(('phgdpr/customer_data_remove/account_delete_queue_pending_message')));
         return $this->_redirectReferer();
     }
 

diff --git a/app/code/community/PH2M/Gdpr/etc/config.xml b/app/code/community/PH2M/Gdpr/etc/config.xml
@@ -78,12 +78,12 @@
             <email>
                 <phgdpr_customer_data_remove_confirm_email_template translate="label" module="phgdpr">
                     <label>Customer remove data</label>
-                    <file>ph/gdpr/customer_remove_confirm.html</file>
+                    <file>ph/gdpr/account_deleted_email_template.html</file>
                     <type>html</type>
                 </phgdpr_customer_data_remove_confirm_email_template>
                 <phgdpr_customer_data_download_email_template translate="label" module="phgdpr">
                     <label>Customer download data</label>
-                    <file>ph/gdpr/customer_data_download.html</file>
+                    <file>ph/gdpr/account_download_email_template.html</file>
                     <type>html</type>
                 </phgdpr_customer_data_download_email_template>
             </email>
@@ -93,6 +93,9 @@
         <jobs>
             <phgdpr_queue_runner>
                 <run>
+                    <schedule>
+                        <cron_expr>*/30 * * * *</cron_expr>
+                    </schedule>
                     <model>phgdpr/observer::runQueueRunner</model>
                 </run>
             </phgdpr_queue_runner>

diff --git a/app/code/community/PH2M/Gdpr/etc/system.xml b/app/code/community/PH2M/Gdpr/etc/system.xml
@@ -278,7 +278,6 @@
                             <show_in_store>1</show_in_store>
                             <depends>
                                 <enable>1</enable>
-                                <enable_remove_customer_account>0</enable_remove_customer_account>
                             </depends>
                         </lock_account_message>
                         <email_heading translate="label comment">