Merge pull request #1088 from vishal-singh-webkul/gli-1868

Updated: Customer deletion and ban process and added filters for the admin to view the banned customers.

Author: rohit053

admin/themes/default/template/controllers/customers/helpers/view/view.tpl

@@ -146,15 +146,27 @@
 						<label class="control-label col-lg-3">{l s='Status'}</label>
 						<div class="col-lg-9">
 							<p class="form-control-static">
-								{if $customer->active}
-									<span class="label label-success">
-										<i class="icon-check"></i>
-										{l s='Active'}
+								{if !$customer->deleted}
+									{if $customer->active}
+										<span class="label label-success">
+											<i class="icon-check"></i>
+											{l s='Active'}
+										</span>
+									{else}
+										<span class="label label-danger">
+											<i class="icon-remove"></i>
+											{l s='Inactive'}
+										</span>
+									{/if}
+								{elseif $customer->deleted == Customer::STATUS_BANNED}
+									<span class="label label-warning">
+										<i class="icon-remove"></i>
+										{l s='Banned'}
 									</span>
-								{else}
+								{elseif $customer->deleted == Customer::STATUS_DELETED}
 									<span class="label label-danger">
 										<i class="icon-remove"></i>
-										{l s='Inactive'}
+										{l s='Deleted'}
 									</span>
 								{/if}
 							</p>

classes/Customer.php

@@ -135,6 +135,9 @@ class CustomerCore extends ObjectModel
 
     public $groupBox;
 
+    const STATUS_BANNED = 1;
+    const STATUS_DELETED = 2;
+
     protected $webserviceParameters = array(
         'fields' => array(
             'id_default_group' => array('xlink_resource' => 'groups'),
@@ -179,7 +182,7 @@ class CustomerCore extends ObjectModel
             'id_risk' =>                    array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'copy_post' => false),
             'max_payment_days' =>            array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'copy_post' => false),
             'active' =>                    array('type' => self::TYPE_BOOL, 'validate' => 'isBool', 'copy_post' => false),
-            'deleted' =>                    array('type' => self::TYPE_BOOL, 'validate' => 'isBool', 'copy_post' => false),
+            'deleted' =>                    array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'copy_post' => false),
             'note' =>                        array('type' => self::TYPE_HTML, 'validate' => 'isCleanHtml', 'size' => 65000, 'copy_post' => false),
             'is_guest' =>                    array('type' => self::TYPE_BOOL, 'validate' => 'isBool', 'copy_post' => false),
             'id_shop' =>                    array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'copy_post' => false),

controllers/admin/AdminCustomersController.php

@@ -170,6 +170,11 @@ public function __construct()
                 'type' => 'datetime',
                 'search' => false,
                 'havingFilter' => true
+            ),
+            'deleted' => array(
+                'title' => $this->l('Banned'),
+                'type' => 'bool',
+                'displayed' => false,
             )
         ));
 
@@ -218,6 +223,12 @@ public function postProcess()
         }
 
         parent::postProcess();
+        // Added this to check if the filter for the banned(deleted) is used, since $this->delete = true will not display the deleted customers.
+        $prefix = $this->getCookieFilterPrefix();
+        $filters = $this->context->cookie->getFamily($prefix.$this->table.'Filter_');
+        if (isset($filters[$prefix.$this->table.'Filter_deleted']) && $filters[$prefix.$this->table.'Filter_deleted'] == 1) {
+            $this->deleted = false;
+        }
     }
 
     public function initContent()
@@ -753,6 +764,7 @@ public function renderKpis()
         $helper->color = 'color2';
         $helper->title = $this->l('Banned Customers', null, null, false);
         $helper->subtitle = $this->l('All Time', null, null, false);
+        $helper->href = $this->context->link->getAdminLink('AdminCustomers').'&customerFilter_deleted=1';
         $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=total_banned_customers';
         $helper->tooltip = $this->l('The total number of banned customers.', null, null, false);
         $kpis[] = $helper;
@@ -962,7 +974,7 @@ public function processDelete()
         if (Validate::isLoadedObject($objCustomer = $this->loadObject())) {
             if ($this->delete_mode == 'real' && Order::getCustomerOrders($objCustomer->id, true)) {
                 $objCustomer->email = 'anonymous'.'-'.$objCustomer->id.'@'.Tools::link_rewrite(Configuration::get('PS_SHOP_NAME')).'_anonymous.com';
-                $objCustomer->deleted = 1;
+                $objCustomer->deleted = Customer::STATUS_DELETED;
                 if (!$objCustomer->update()) {
                     $this->errors[] = Tools::displayError('Some error ocurred while deleting the Customer');
                     return;
@@ -1003,7 +1015,7 @@ protected function processBulkDelete()
                         // check if customer has orders for email change else customer will be deleted
                         if (Order::getCustomerOrders($objCustomer->id, true)) {
                             $objCustomer->email = 'anonymous'.'-'.$objCustomer->id.'@'.Tools::getShopDomain();
-                            $objCustomer->deleted = 1;
+                            $objCustomer->deleted = Customer::STATUS_DELETED;
                             if ($objCustomer->update()) {
                                 // unset the customer which is processed
                                 // not processed customers will be deleted with default process if no errors are there

modules/blocknewsletter/blocknewsletter.php

@@ -84,12 +84,23 @@ public function registerHooks()
                 'actionCustomerAccountAdd',
                 'registerGDPRConsent',
                 'actionExportGDPRData',
+                'actionObjectCustomerUpdateBefore',
                 'actionDeleteGDPRCustomer',
                 'actionObjectCustomerDeleteAfter',
             )
         );
     }
 
+    public function hookActionObjectCustomerUpdateBefore($params)
+    {
+        $objCustomer = new Customer ($params['object']->id);
+        if ($params['object']->deleted == Customer::STATUS_DELETED
+            && ($register_status = $this->isNewsletterRegistered($objCustomer->email))
+        ) {
+            $this->unregister($objCustomer->email, $register_status);
+        }
+    }
+
     public function hookActionObjectCustomerDeleteAfter($params)
     {
         $objCustomer = $params['object'];