Fix conflict entity_id with special product condition

magepow · May 26, 2021 · 04dcc0a · 04dcc0a
1 parent 17cf256
commit 04dcc0a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Block/Adminhtml/Sizechart/Edit/Tab/Main.php b/Block/Adminhtml/Sizechart/Edit/Tab/Main.php
@@ -44,7 +44,8 @@ protected function _prepareForm()
                 'base_fieldset',
                 ['legend' => __('Edit Size Chart Rule'), 'class' => 'fieldset-wide']
             );
-            $fieldset->addField('entity_id', 'hidden', ['name' => 'entity_id']);
+            // $fieldset->addField('entity_id', 'hidden', ['name' => 'entity_id']); // not use will conflict entity_id ofcondition product
+            $fieldset->addField('sizechart_id', 'hidden', ['name' => 'sizechart_id']);
         } else {
             $fieldset = $form->addFieldset(
                 'base_fieldset',

diff --git a/Controller/Adminhtml/Sizechart/AddRow.php b/Controller/Adminhtml/Sizechart/AddRow.php
@@ -27,7 +27,6 @@ public function execute()
         $rowId = (int) $this->getRequest()->getParam('id');
         $storeViewId = $this->getRequest()->getParam('stores');
         $rowData = $this->sizechartFactory->create();
-
         if ($rowId) {
             // $rowData->setStoreViewId($storeViewId)->load($rowId);
             $rowData = $rowData->setStoreViewId($storeViewId)->load($rowId);
@@ -45,13 +44,15 @@ public function execute()
                     unset($tmp['entity_id']);
                     $rowData->addData($tmp);
                 }
+                $rowData->setData('sizechart_id', $rowData->getEntityId()); // fix conflict entity_id in product condition
             }
         }
 
         $this->coreRegistry->register('row_data', $rowData);
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
         $title = $rowId ? __('Edit Size chart') . $rowTitle : __('Add Size chart');
         $resultPage->getConfig()->getTitle()->prepend($title);
+
         return $resultPage;
     }
 }
diff --git a/Controller/Adminhtml/Sizechart/Save.php b/Controller/Adminhtml/Sizechart/Save.php
@@ -27,7 +27,8 @@ public function execute()
         $data = $this->getRequest()->getPostValue();
 
         if ($data) {
-            $id = $this->getRequest()->getParam('entity_id');
+            $id = $this->getRequest()->getParam('sizechart_id');
+            if($id) $data['entity_id'] = $id; // fix conflict entity_id in product condition
             $model = $this->_sizechartFactory->create();
             $storeViewId = $this->getRequest()->getParam('stores');
             $model->load($id);