Version Notes
* Jayje_Rma extension
*
* @category Return Merchant Authorization Magento - wakensys
* @package Jayje_Rma
* @copyright Copyright (c) 2013
* @license http://opensource.org/licenses/mit-license.php MIT License
* @category Jayje
* @package Jayje_Rma
* @author wakensys
* @developper s.ratheepan@gmail.com
Download this release
Release Info
| Developer | wakensys |
| Extension | Jayje |
| Version | 1.00.20 |
| Comparing to | |
| See all releases | |
Code changes from version 1.00.19 to 1.00.20
- app/code/community/jayje/Rma/Block/Adminhtml/Rma/Edit.php +1 -1
- app/code/community/jayje/Rma/Block/Adminhtml/Rma/Edit/Tab/Form.php +9 -4
- app/code/community/jayje/Rma/Block/Adminhtml/Rma/Edit/Tab/Order.php +5 -4
- app/code/community/jayje/Rma/Block/Adminhtml/Rma/Grid.php +9 -3
- app/code/community/jayje/Rma/Block/Rma.php +1 -1
- app/code/community/jayje/Rma/Model/Mysql4/Rcomments.php +23 -0
- app/code/community/jayje/Rma/Model/Mysql4/Rcomments/Collection.php +23 -0
- app/code/community/jayje/Rma/Model/Mysql4/Rproducts.php +23 -0
- app/code/community/jayje/Rma/Model/Mysql4/Rproducts/Collection.php +23 -0
- app/code/community/jayje/Rma/Model/Rcomments.php +29 -0
- app/code/community/jayje/Rma/Model/Rproducts.php +29 -0
- app/code/community/jayje/Rma/Model/Status.php +14 -0
- app/code/community/jayje/Rma/Model/config/Returntype.php +31 -0
- app/code/community/jayje/Rma/Model/config/Status.php +30 -0
- app/code/community/jayje/Rma/controllers/Adminhtml/RmaController.php +61 -54
- app/code/community/jayje/Rma/controllers/IndexController.php +46 -33
- app/code/community/jayje/Rma/etc/config.xml +28 -22
- app/code/community/jayje/Rma/etc/system.xml +10 -0
- app/code/community/jayje/Rma/sql/Rma_setup/mysql4-install-0.1.0.php +4 -5
- app/design/frontend/default/default/template/rma/request.phtml +4 -0
- app/design/frontend/default/default/template/rma/ritem.phtml +1 -1
- app/design/frontend/default/default/template/rma/view.phtml +6 -3
- package.xml +7 -8
app/code/community/jayje/Rma/Block/Adminhtml/Rma/Edit.php
CHANGED
|
@@ -49,7 +49,7 @@ class Jayje_Rma_Block_Adminhtml_Rma_Edit extends Mage_Adminhtml_Block_Widget_For
|
|
| 49 |
|
| 50 |
public function getHeaderText(){
|
| 51 |
if( Mage::registry('rma_data') && Mage::registry('rma_data')->getId() ) {
|
| 52 |
-
$status = Mage::registry('rma_data')->
|
| 53 |
$status = Mage::getModel('rma/rstatus')->getStatusById($status);
|
| 54 |
return Mage::helper('rma')->__("Edit RMA, Status -'%s' ",
|
| 55 |
$this->htmlEscape($status));
|
| 49 |
|
| 50 |
public function getHeaderText(){
|
| 51 |
if( Mage::registry('rma_data') && Mage::registry('rma_data')->getId() ) {
|
| 52 |
+
$status = Mage::registry('rma_data')->getAdminstatus();
|
| 53 |
$status = Mage::getModel('rma/rstatus')->getStatusById($status);
|
| 54 |
return Mage::helper('rma')->__("Edit RMA, Status -'%s' ",
|
| 55 |
$this->htmlEscape($status));
|
app/code/community/jayje/Rma/Block/Adminhtml/Rma/Edit/Tab/Form.php
CHANGED
|
@@ -72,13 +72,18 @@ class Jayje_Rma_Block_Adminhtml_Rma_Edit_Tab_Form extends Mage_Adminhtml_Block_W
|
|
| 72 |
|
| 73 |
|
| 74 |
}
|
| 75 |
-
$fieldset->addField('
|
| 76 |
-
'label' => Mage::helper('rma')->__('
|
| 77 |
-
'name' => '
|
| 78 |
'values' => Mage::getModel('rma/rstatus')->getAllStatusArray('rma_status'),
|
| 79 |
));
|
| 80 |
|
| 81 |
-
$fieldset->addField('
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 82 |
'name' => 'reason',
|
| 83 |
'label' => Mage::helper('rma')->__('Reason'),
|
| 84 |
'title' => Mage::helper('rma')->__('Reason'),
|
| 72 |
|
| 73 |
|
| 74 |
}
|
| 75 |
+
$fieldset->addField('adminstatus', 'select', array(
|
| 76 |
+
'label' => Mage::helper('rma')->__('Tracking No:'),
|
| 77 |
+
'name' => 'adminstatus',
|
| 78 |
'values' => Mage::getModel('rma/rstatus')->getAllStatusArray('rma_status'),
|
| 79 |
));
|
| 80 |
|
| 81 |
+
$fieldset->addField('tracking_no', 'text', array(
|
| 82 |
+
'label' => Mage::helper('rma')->__('Tracking No'),
|
| 83 |
+
'name' => 'tracking_no',
|
| 84 |
+
));
|
| 85 |
+
|
| 86 |
+
$fieldset->addField('reason', 'textarea', array(
|
| 87 |
'name' => 'reason',
|
| 88 |
'label' => Mage::helper('rma')->__('Reason'),
|
| 89 |
'title' => Mage::helper('rma')->__('Reason'),
|
app/code/community/jayje/Rma/Block/Adminhtml/Rma/Edit/Tab/Order.php
CHANGED
|
@@ -39,10 +39,11 @@ class Jayje_Rma_Block_Adminhtml_Rma_Edit_Tab_Order extends Mage_Adminhtml_Block_
|
|
| 39 |
|
| 40 |
protected function _prepareCollection()
|
| 41 |
{
|
| 42 |
-
|
| 43 |
-
|
| 44 |
-
|
| 45 |
-
|
|
|
|
| 46 |
return parent::_prepareCollection();
|
| 47 |
}
|
| 48 |
|
| 39 |
|
| 40 |
protected function _prepareCollection()
|
| 41 |
{
|
| 42 |
+
$collection = Mage::getResourceModel($this->_getCollectionClass());
|
| 43 |
+
$id = $this->getRequest()->getParam('id');
|
| 44 |
+
$order_id = Mage::getSingleton('rma/rma')->load($id)->getOrderId();
|
| 45 |
+
$collection->addFieldToFilter('main_table.entity_id', $order_id);
|
| 46 |
+
$this->setCollection($collection);
|
| 47 |
return parent::_prepareCollection();
|
| 48 |
}
|
| 49 |
|
app/code/community/jayje/Rma/Block/Adminhtml/Rma/Grid.php
CHANGED
|
@@ -52,14 +52,20 @@ class Jayje_Rma_Block_Adminhtml_Rma_Grid extends Mage_Adminhtml_Block_Widget_Gri
|
|
| 52 |
'index' => 'email',
|
| 53 |
));
|
| 54 |
|
| 55 |
-
$this->addColumn('
|
| 56 |
'header' => Mage::helper('rma')->__('Status'),
|
| 57 |
'align' =>'left',
|
| 58 |
-
'index' => '
|
| 59 |
'type' => 'options',
|
| 60 |
'options' => $this->getAllStatus('rma_status')
|
| 61 |
));
|
| 62 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 63 |
$this->addColumn('return_type', array(
|
| 64 |
'header' => Mage::helper('rma')->__('Return Type'),
|
| 65 |
'align' =>'left',
|
|
@@ -122,7 +128,7 @@ class Jayje_Rma_Block_Adminhtml_Rma_Grid extends Mage_Adminhtml_Block_Widget_Gri
|
|
| 122 |
protected function getAllStatus($status=''){
|
| 123 |
$result = Mage::getModel('rma/rstatus')->getAllStatus($status);
|
| 124 |
foreach($result as $row){
|
| 125 |
-
$arr[$row['
|
| 126 |
}
|
| 127 |
return $arr;
|
| 128 |
}
|
| 52 |
'index' => 'email',
|
| 53 |
));
|
| 54 |
|
| 55 |
+
$this->addColumn('adminstatus', array(
|
| 56 |
'header' => Mage::helper('rma')->__('Status'),
|
| 57 |
'align' =>'left',
|
| 58 |
+
'index' => 'adminstatus',
|
| 59 |
'type' => 'options',
|
| 60 |
'options' => $this->getAllStatus('rma_status')
|
| 61 |
));
|
| 62 |
|
| 63 |
+
$this->addColumn('tracking_no', array(
|
| 64 |
+
'header' => Mage::helper('rma')->__('Tracking No:'),
|
| 65 |
+
'align' =>'left',
|
| 66 |
+
'index' => 'tracking_no',
|
| 67 |
+
));
|
| 68 |
+
|
| 69 |
$this->addColumn('return_type', array(
|
| 70 |
'header' => Mage::helper('rma')->__('Return Type'),
|
| 71 |
'align' =>'left',
|
| 128 |
protected function getAllStatus($status=''){
|
| 129 |
$result = Mage::getModel('rma/rstatus')->getAllStatus($status);
|
| 130 |
foreach($result as $row){
|
| 131 |
+
$arr[$row['code']] = $row['label'];
|
| 132 |
}
|
| 133 |
return $arr;
|
| 134 |
}
|
app/code/community/jayje/Rma/Block/Rma.php
CHANGED
|
@@ -56,7 +56,7 @@ class Jayje_Rma_Block_Rma extends Mage_Core_Block_Template
|
|
| 56 |
|
| 57 |
public function getRType(){
|
| 58 |
|
| 59 |
-
$return_types = Mage::getModel('rma/rstatus')->
|
| 60 |
foreach($return_types as $return_type){
|
| 61 |
echo '<option value="'.$return_type['code'].'">'.$return_type['label'].'</option>';
|
| 62 |
}
|
| 56 |
|
| 57 |
public function getRType(){
|
| 58 |
|
| 59 |
+
$return_types = Mage::getModel('rma/rstatus')->getAllStatus('rma_returntype');
|
| 60 |
foreach($return_types as $return_type){
|
| 61 |
echo '<option value="'.$return_type['code'].'">'.$return_type['label'].'</option>';
|
| 62 |
}
|
app/code/community/jayje/Rma/Model/Mysql4/Rcomments.php
ADDED
|
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Jayje_Rma extension
|
| 4 |
+
*
|
| 5 |
+
* @category Return Merchant Authorization Magento - wakensys
|
| 6 |
+
* @package Jayje_Rma
|
| 7 |
+
* @copyright Copyright (c) 2013
|
| 8 |
+
* @license http://opensource.org/licenses/mit-license.php MIT License
|
| 9 |
+
* @category Jayje
|
| 10 |
+
* @package Jayje_Rma
|
| 11 |
+
* @author wakensys
|
| 12 |
+
* @developper s.ratheepan@gmail.com
|
| 13 |
+
*/
|
| 14 |
+
|
| 15 |
+
|
| 16 |
+
class Jayje_Rma_Model_Mysql4_Rcomments extends Mage_Core_Model_Mysql4_Abstract{
|
| 17 |
+
|
| 18 |
+
public function _construct(){
|
| 19 |
+
$this->_init('rma/rcomments', 'id');
|
| 20 |
+
}
|
| 21 |
+
|
| 22 |
+
|
| 23 |
+
}
|
app/code/community/jayje/Rma/Model/Mysql4/Rcomments/Collection.php
ADDED
|
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Jayje_Rma extension
|
| 4 |
+
*
|
| 5 |
+
* @category Return Merchant Authorization Magento - wakensys
|
| 6 |
+
* @package Jayje_Rma
|
| 7 |
+
* @copyright Copyright (c) 2013
|
| 8 |
+
* @license http://opensource.org/licenses/mit-license.php MIT License
|
| 9 |
+
* @category Jayje
|
| 10 |
+
* @package Jayje_Rma
|
| 11 |
+
* @author wakensys
|
| 12 |
+
* @developper s.ratheepan@gmail.com
|
| 13 |
+
*/
|
| 14 |
+
|
| 15 |
+
|
| 16 |
+
class Jayje_Rma_Model_Mysql4_Rcomments_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
|
| 17 |
+
{
|
| 18 |
+
|
| 19 |
+
public function _construct(){
|
| 20 |
+
parent::_construct();
|
| 21 |
+
$this->_init('rma/rcomments');
|
| 22 |
+
}
|
| 23 |
+
}
|
app/code/community/jayje/Rma/Model/Mysql4/Rproducts.php
ADDED
|
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Jayje_Rma extension
|
| 4 |
+
*
|
| 5 |
+
* @category Return Merchant Authorization Magento - wakensys
|
| 6 |
+
* @package Jayje_Rma
|
| 7 |
+
* @copyright Copyright (c) 2013
|
| 8 |
+
* @license http://opensource.org/licenses/mit-license.php MIT License
|
| 9 |
+
* @category Jayje
|
| 10 |
+
* @package Jayje_Rma
|
| 11 |
+
* @author wakensys
|
| 12 |
+
* @developper s.ratheepan@gmail.com
|
| 13 |
+
*/
|
| 14 |
+
|
| 15 |
+
|
| 16 |
+
class Jayje_Rma_Model_Mysql4_Rproducts extends Mage_Core_Model_Mysql4_Abstract{
|
| 17 |
+
|
| 18 |
+
public function _construct(){
|
| 19 |
+
$this->_init('rma/rproducts', 'rpid');
|
| 20 |
+
}
|
| 21 |
+
|
| 22 |
+
|
| 23 |
+
}
|
app/code/community/jayje/Rma/Model/Mysql4/Rproducts/Collection.php
ADDED
|
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Jayje_Rma extension
|
| 4 |
+
*
|
| 5 |
+
* @category Return Merchant Authorization Magento - wakensys
|
| 6 |
+
* @package Jayje_Rma
|
| 7 |
+
* @copyright Copyright (c) 2013
|
| 8 |
+
* @license http://opensource.org/licenses/mit-license.php MIT License
|
| 9 |
+
* @category Jayje
|
| 10 |
+
* @package Jayje_Rma
|
| 11 |
+
* @author wakensys
|
| 12 |
+
* @developper s.ratheepan@gmail.com
|
| 13 |
+
*/
|
| 14 |
+
|
| 15 |
+
|
| 16 |
+
class Jayje_Rma_Model_Mysql4_Rproducts_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
|
| 17 |
+
{
|
| 18 |
+
|
| 19 |
+
public function _construct(){
|
| 20 |
+
parent::_construct();
|
| 21 |
+
$this->_init('rma/rproducts');
|
| 22 |
+
}
|
| 23 |
+
}
|
app/code/community/jayje/Rma/Model/Rcomments.php
ADDED
|
@@ -0,0 +1,29 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Jayje_Rma extension
|
| 4 |
+
*
|
| 5 |
+
* @category Return Merchant Authorization Magento - wakensys
|
| 6 |
+
* @package Jayje_Rma
|
| 7 |
+
* @copyright Copyright (c) 2013
|
| 8 |
+
* @license http://opensource.org/licenses/mit-license.php MIT License
|
| 9 |
+
* @category Jayje
|
| 10 |
+
* @package Jayje_Rma
|
| 11 |
+
* @author wakensys
|
| 12 |
+
* @developper s.ratheepan@gmail.com
|
| 13 |
+
*/
|
| 14 |
+
|
| 15 |
+
class Jayje_Rma_Model_Rcomments extends Mage_Core_Model_Abstract{
|
| 16 |
+
|
| 17 |
+
public function _construct(){
|
| 18 |
+
parent::_construct();
|
| 19 |
+
$this->_init('rma/rcomments');
|
| 20 |
+
}
|
| 21 |
+
|
| 22 |
+
public function getRcidByRmaid($rmaid){
|
| 23 |
+
$db = Mage::getSingleton('core/resource')->getConnection('core_read');
|
| 24 |
+
$que = "SELECT id FROM `rma_comments` where rmaid='$rmaid'";
|
| 25 |
+
$resultn = $db->fetchCol($que);
|
| 26 |
+
return $resultn;
|
| 27 |
+
}
|
| 28 |
+
|
| 29 |
+
}
|
app/code/community/jayje/Rma/Model/Rproducts.php
ADDED
|
@@ -0,0 +1,29 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Jayje_Rma extension
|
| 4 |
+
*
|
| 5 |
+
* @category Return Merchant Authorization Magento - wakensys
|
| 6 |
+
* @package Jayje_Rma
|
| 7 |
+
* @copyright Copyright (c) 2013
|
| 8 |
+
* @license http://opensource.org/licenses/mit-license.php MIT License
|
| 9 |
+
* @category Jayje
|
| 10 |
+
* @package Jayje_Rma
|
| 11 |
+
* @author wakensys
|
| 12 |
+
* @developper s.ratheepan@gmail.com
|
| 13 |
+
*/
|
| 14 |
+
|
| 15 |
+
class Jayje_Rma_Model_Rproducts extends Mage_Core_Model_Abstract{
|
| 16 |
+
|
| 17 |
+
public function _construct(){
|
| 18 |
+
parent::_construct();
|
| 19 |
+
$this->_init('rma/rproducts');
|
| 20 |
+
}
|
| 21 |
+
|
| 22 |
+
public function getRpidByRmaid($rmaid){
|
| 23 |
+
$db = Mage::getSingleton('core/resource')->getConnection('core_read');
|
| 24 |
+
$que = "SELECT * FROM `rma_products` where rmaid='$rmaid'";
|
| 25 |
+
$resultn = $db->fetchOne($que);
|
| 26 |
+
return $resultn;
|
| 27 |
+
}
|
| 28 |
+
|
| 29 |
+
}
|
app/code/community/jayje/Rma/Model/Status.php
CHANGED
|
@@ -32,4 +32,18 @@ class Jayje_Rma_Model_Status extends Varien_Object
|
|
| 32 |
}
|
| 33 |
return $arr;
|
| 34 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 35 |
}
|
| 32 |
}
|
| 33 |
return $arr;
|
| 34 |
}
|
| 35 |
+
public function toOptionArray()
|
| 36 |
+
{
|
| 37 |
+
|
| 38 |
+
return array(
|
| 39 |
+
array('value'=>1, 'label'=>Mage::helper('rma')->__('Hello')),
|
| 40 |
+
array('value'=>2, 'label'=>Mage::helper('rma')->__('Goodbye')),
|
| 41 |
+
array('value'=>3, 'label'=>Mage::helper('rma')->__('Yes')),
|
| 42 |
+
array('value'=>4, 'label'=>Mage::helper('rma')->__('No')),
|
| 43 |
+
);
|
| 44 |
+
|
| 45 |
+
|
| 46 |
+
}
|
| 47 |
+
|
| 48 |
+
|
| 49 |
}
|
app/code/community/jayje/Rma/Model/config/Returntype.php
ADDED
|
@@ -0,0 +1,31 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Jayje_Rma extension
|
| 4 |
+
*
|
| 5 |
+
* @category Return Merchant Authorization Magento - wakensys
|
| 6 |
+
* @package Jayje_Rma
|
| 7 |
+
* @copyright Copyright (c) 2013
|
| 8 |
+
* @license http://opensource.org/licenses/mit-license.php MIT License
|
| 9 |
+
* @category Jayje
|
| 10 |
+
* @package Jayje_Rma
|
| 11 |
+
* @author wakensys
|
| 12 |
+
* @developper s.ratheepan@gmail.com
|
| 13 |
+
*/
|
| 14 |
+
|
| 15 |
+
|
| 16 |
+
class Jayje_Rma_Model_Config_Returntype extends Varien_Object
|
| 17 |
+
{
|
| 18 |
+
// const STATUS_ENABLED = 1;
|
| 19 |
+
// const STATUS_DISABLED = 2;
|
| 20 |
+
|
| 21 |
+
|
| 22 |
+
public function toOptionArray()
|
| 23 |
+
{
|
| 24 |
+
|
| 25 |
+
return Mage::getModel('rma/rstatus')->getAllStatusArray('rma_returntype');
|
| 26 |
+
|
| 27 |
+
|
| 28 |
+
}
|
| 29 |
+
|
| 30 |
+
|
| 31 |
+
}
|
app/code/community/jayje/Rma/Model/config/Status.php
ADDED
|
@@ -0,0 +1,30 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Jayje_Rma extension
|
| 4 |
+
*
|
| 5 |
+
* @category Return Merchant Authorization Magento - wakensys
|
| 6 |
+
* @package Jayje_Rma
|
| 7 |
+
* @copyright Copyright (c) 2013
|
| 8 |
+
* @license http://opensource.org/licenses/mit-license.php MIT License
|
| 9 |
+
* @category Jayje
|
| 10 |
+
* @package Jayje_Rma
|
| 11 |
+
* @author wakensys
|
| 12 |
+
* @developper s.ratheepan@gmail.com
|
| 13 |
+
*/
|
| 14 |
+
|
| 15 |
+
|
| 16 |
+
class Jayje_Rma_Model_Config_Status extends Varien_Object
|
| 17 |
+
{
|
| 18 |
+
// const STATUS_ENABLED = 1;
|
| 19 |
+
// const STATUS_DISABLED = 2;
|
| 20 |
+
|
| 21 |
+
|
| 22 |
+
public function toOptionArray()
|
| 23 |
+
{
|
| 24 |
+
|
| 25 |
+
return Mage::getModel('rma/rstatus')->getAllStatusArray('rma_status');
|
| 26 |
+
|
| 27 |
+
}
|
| 28 |
+
|
| 29 |
+
|
| 30 |
+
}
|
app/code/community/jayje/Rma/controllers/Adminhtml/RmaController.php
CHANGED
|
@@ -75,68 +75,56 @@ class Jayje_Rma_Adminhtml_RmaController extends Mage_Adminhtml_Controller_action
|
|
| 75 |
}
|
| 76 |
|
| 77 |
public function saveAction() {
|
| 78 |
-
|
| 79 |
-
|
| 80 |
-
if(isset($_FILES['filename']['name']) && $_FILES['filename']['name'] != '') {
|
| 81 |
-
try {
|
| 82 |
-
/* Starting upload */
|
| 83 |
-
$uploader = new Varien_File_Uploader('filename');
|
| 84 |
-
$uploader->setAllowedExtensions(array('jpg','jpeg','gif','png'));
|
| 85 |
-
$uploader->setAllowRenameFiles(false);
|
| 86 |
-
$uploader->setFilesDispersion(false);
|
| 87 |
-
$path = Mage::getBaseDir('media') . DS ;
|
| 88 |
-
$uploader->save($path, $_FILES['filename']['name'] );
|
| 89 |
-
|
| 90 |
-
} catch (Exception $e) {
|
| 91 |
-
|
| 92 |
-
}
|
| 93 |
|
| 94 |
-
|
| 95 |
-
|
|
|
|
|
|
|
| 96 |
}
|
| 97 |
-
|
| 98 |
-
|
| 99 |
-
|
| 100 |
-
|
| 101 |
-
$
|
| 102 |
-
|
| 103 |
-
|
| 104 |
-
|
|
|
|
| 105 |
try {
|
| 106 |
if ($model->getCreatedTime == NULL || $model->getUpdateTime() == NULL) {
|
| 107 |
-
$
|
| 108 |
->setUpdateTime(now());
|
| 109 |
} else {
|
| 110 |
-
$
|
| 111 |
-
}
|
| 112 |
-
|
| 113 |
-
if($newstatus != $laststatus){
|
| 114 |
-
$model->setStatus($newstatus);
|
| 115 |
}
|
| 116 |
-
|
| 117 |
-
$
|
| 118 |
-
|
| 119 |
-
|
|
|
|
| 120 |
$update_time = date("Y-m-d g:i:s");
|
| 121 |
$comments = $data['comments'];
|
| 122 |
-
$connection = Mage::getSingleton('core/resource')->getConnection('core_write');
|
| 123 |
$admin = Mage::getSingleton('admin/session')->getUser();
|
| 124 |
$by = $admin['username'];
|
| 125 |
if($comments != ''){
|
| 126 |
-
|
| 127 |
-
|
| 128 |
-
|
| 129 |
-
|
| 130 |
-
|
|
|
|
|
|
|
|
|
|
| 131 |
}
|
| 132 |
if($newstatus != $laststatus){
|
| 133 |
-
|
| 134 |
-
|
| 135 |
-
|
| 136 |
-
|
| 137 |
-
|
| 138 |
-
|
| 139 |
-
|
| 140 |
}
|
| 141 |
}
|
| 142 |
|
|
@@ -147,7 +135,7 @@ class Jayje_Rma_Adminhtml_RmaController extends Mage_Adminhtml_Controller_action
|
|
| 147 |
Mage::getSingleton('adminhtml/session')->setFormData(false);
|
| 148 |
|
| 149 |
if ($this->getRequest()->getParam('back')) {
|
| 150 |
-
$this->_redirect('*/*/edit', array('id' => $
|
| 151 |
return;
|
| 152 |
}
|
| 153 |
$this->_redirect('*/*/');
|
|
@@ -166,11 +154,22 @@ class Jayje_Rma_Adminhtml_RmaController extends Mage_Adminhtml_Controller_action
|
|
| 166 |
public function deleteAction() {
|
| 167 |
if( $this->getRequest()->getParam('id') > 0 ) {
|
| 168 |
try {
|
|
|
|
| 169 |
$model = Mage::getModel('rma/rma');
|
| 170 |
-
|
| 171 |
-
|
| 172 |
-
|
| 173 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 174 |
Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('adminhtml')->__('Item was successfully deleted'));
|
| 175 |
$this->_redirect('*/*/');
|
| 176 |
} catch (Exception $e) {
|
|
@@ -184,12 +183,20 @@ class Jayje_Rma_Adminhtml_RmaController extends Mage_Adminhtml_Controller_action
|
|
| 184 |
public function massDeleteAction() {
|
| 185 |
$rmaIds = $this->getRequest()->getParam('rma');
|
| 186 |
if(!is_array($rmaIds)) {
|
| 187 |
-
|
| 188 |
} else {
|
| 189 |
try {
|
| 190 |
foreach ($rmaIds as $rmaId) {
|
| 191 |
$rma = Mage::getModel('rma/rma')->load($rmaId);
|
| 192 |
$rma->delete();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 193 |
}
|
| 194 |
Mage::getSingleton('adminhtml/session')->addSuccess(
|
| 195 |
Mage::helper('adminhtml')->__(
|
| 75 |
}
|
| 76 |
|
| 77 |
public function saveAction() {
|
| 78 |
+
if ($data = $this->getRequest()->getPost()) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 79 |
|
| 80 |
+
$rmaId = (int) $this->getRequest()->getParam('id');
|
| 81 |
+
$rma = Mage::getsingleton('rma/rma');
|
| 82 |
+
if ($rmaId) {
|
| 83 |
+
$rma->load($rmaId) ;
|
| 84 |
}
|
| 85 |
+
$laststatus = $rma->getAdminstatus();
|
| 86 |
+
$rma->setRmaflow('');
|
| 87 |
+
$rma->setUpdateTime('');
|
| 88 |
+
$rma->setData($data)
|
| 89 |
+
->setId($rmaId);
|
| 90 |
+
|
| 91 |
+
$newstatus = $data['adminstatus'];
|
| 92 |
+
|
| 93 |
+
// print_r($data); print_r($rma); exit;
|
| 94 |
try {
|
| 95 |
if ($model->getCreatedTime == NULL || $model->getUpdateTime() == NULL) {
|
| 96 |
+
$rma->setCreatedTime(now())
|
| 97 |
->setUpdateTime(now());
|
| 98 |
} else {
|
| 99 |
+
$rma->setUpdateTime(now());
|
|
|
|
|
|
|
|
|
|
|
|
|
| 100 |
}
|
| 101 |
+
|
| 102 |
+
$rma->save();
|
| 103 |
+
|
| 104 |
+
if($rma->getId() !=''){
|
| 105 |
+
$rmaid = $rma->getId();
|
| 106 |
$update_time = date("Y-m-d g:i:s");
|
| 107 |
$comments = $data['comments'];
|
|
|
|
| 108 |
$admin = Mage::getSingleton('admin/session')->getUser();
|
| 109 |
$by = $admin['username'];
|
| 110 |
if($comments != ''){
|
| 111 |
+
$model1 = Mage::getModel('rma/rcomments');
|
| 112 |
+
$model1->setRmaid($rmaid);
|
| 113 |
+
$model1->setStype('Comments');
|
| 114 |
+
$model1->setComments($comments);
|
| 115 |
+
$model1->setDate($update_time);
|
| 116 |
+
$model1->setBy($by);
|
| 117 |
+
$model1->save();
|
| 118 |
+
|
| 119 |
}
|
| 120 |
if($newstatus != $laststatus){
|
| 121 |
+
$model2 = Mage::getModel('rma/rcomments');
|
| 122 |
+
$model2->setRmaid($rmaid);
|
| 123 |
+
$model2->setStype('Status');
|
| 124 |
+
$model2->setComments($newstatus);
|
| 125 |
+
$model2->setDate($update_time);
|
| 126 |
+
$model2->setBy($by);
|
| 127 |
+
$model2->save();
|
| 128 |
}
|
| 129 |
}
|
| 130 |
|
| 135 |
Mage::getSingleton('adminhtml/session')->setFormData(false);
|
| 136 |
|
| 137 |
if ($this->getRequest()->getParam('back')) {
|
| 138 |
+
$this->_redirect('*/*/edit', array('id' => $rma->getId()));
|
| 139 |
return;
|
| 140 |
}
|
| 141 |
$this->_redirect('*/*/');
|
| 154 |
public function deleteAction() {
|
| 155 |
if( $this->getRequest()->getParam('id') > 0 ) {
|
| 156 |
try {
|
| 157 |
+
$rmaId = $this->getRequest()->getParam('id');
|
| 158 |
$model = Mage::getModel('rma/rma');
|
| 159 |
+
$model->setId($rmaId)->delete();
|
| 160 |
+
|
| 161 |
+
$rpid = Mage::getModel('rma/rproducts')->getRpidByRmaid($rmaId);
|
| 162 |
+
$model = Mage::getModel('rma/rproducts');
|
| 163 |
+
$model->setId($rpid)->delete();
|
| 164 |
+
|
| 165 |
+
$rcids = Mage::getModel('rma/rcomments')->getRcidByRmaid($rmaId);
|
| 166 |
+
|
| 167 |
+
foreach($rcids as $rcid){
|
| 168 |
+
$model = Mage::getModel('rma/rcomments');
|
| 169 |
+
$model->setId($rcid)->delete();
|
| 170 |
+
}
|
| 171 |
+
|
| 172 |
+
|
| 173 |
Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('adminhtml')->__('Item was successfully deleted'));
|
| 174 |
$this->_redirect('*/*/');
|
| 175 |
} catch (Exception $e) {
|
| 183 |
public function massDeleteAction() {
|
| 184 |
$rmaIds = $this->getRequest()->getParam('rma');
|
| 185 |
if(!is_array($rmaIds)) {
|
| 186 |
+
Mage::getSingleton('adminhtml/session')->addError(Mage::helper('adminhtml')->__('Please select item(s)'));
|
| 187 |
} else {
|
| 188 |
try {
|
| 189 |
foreach ($rmaIds as $rmaId) {
|
| 190 |
$rma = Mage::getModel('rma/rma')->load($rmaId);
|
| 191 |
$rma->delete();
|
| 192 |
+
$rpid = Mage::getModel('rma/rproducts')->getRpidByRmaid($rmaId);
|
| 193 |
+
$model = Mage::getModel('rma/rproducts')->load($rpid)->delete();
|
| 194 |
+
|
| 195 |
+
$rcids = Mage::getModel('rma/rcomments')->getRcidByRmaid($rmaId);
|
| 196 |
+
foreach($rcids as $rcid){
|
| 197 |
+
$model = Mage::getModel('rma/rcomments')->load($rcid)->delete();
|
| 198 |
+
}
|
| 199 |
+
|
| 200 |
}
|
| 201 |
Mage::getSingleton('adminhtml/session')->addSuccess(
|
| 202 |
Mage::helper('adminhtml')->__(
|
app/code/community/jayje/Rma/controllers/IndexController.php
CHANGED
|
@@ -44,46 +44,56 @@ class Jayje_Rma_IndexController extends Mage_Core_Controller_Front_Action
|
|
| 44 |
|
| 45 |
$created_time = date("Y-m-d g:i:s");
|
| 46 |
$arrParams = $this->getRequest()->getParams();
|
| 47 |
-
|
| 48 |
|
| 49 |
$customername =Mage::helper('customer')->getCustomer()->getName();
|
| 50 |
$customerid =Mage::helper('customer')->getCustomer()->getData('entity_id') ;
|
| 51 |
$email =Mage::helper('customer')->getCustomer()->getData('email') ;
|
| 52 |
-
$email =Mage::helper('customer')->getCustomer()->getData('email') ;
|
| 53 |
$order_id = $arrParams['order_id'];
|
| 54 |
if($order_id !=''){
|
| 55 |
-
|
| 56 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 57 |
$package = $arrParams['package'];
|
| 58 |
$return_type = $arrParams['return_type'];
|
| 59 |
$increment_id = Mage::getModel('sales/order')->load($order_id)->getData('increment_id');
|
| 60 |
-
|
| 61 |
-
$connection = Mage::getSingleton('core/resource')->getConnection('core_write');
|
| 62 |
-
$query = "INSERT INTO `rma` (`order_id` ,`status` ,`reason` ,`email` ,`return_type` ,`customer_id` ,`title` ,`package` ,
|
| 63 |
-
`filename` ,`content` ,`created_time`, `increment_id` ,`update_time` ,`created`
|
| 64 |
-
)VALUES (
|
| 65 |
-
'$order_id', 'Pending', '$reason', '$email', '$return_type', '$customerid', '$title', '$package', '', '', '$created_time','$increment_id', NULL , ''
|
| 66 |
-
)";
|
| 67 |
-
$connection->query($query);
|
| 68 |
-
$lastInsertId = $connection->lastInsertId();;
|
| 69 |
|
| 70 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 71 |
|
| 72 |
-
|
| 73 |
-
|
| 74 |
-
|
| 75 |
-
|
| 76 |
-
|
| 77 |
-
|
| 78 |
-
|
| 79 |
-
|
| 80 |
-
|
| 81 |
-
|
| 82 |
-
|
| 83 |
-
|
|
|
|
|
|
|
|
|
|
| 84 |
|
| 85 |
-
|
| 86 |
-
|
|
|
|
| 87 |
}else{
|
| 88 |
$message = $this->__("Sorry, You don't have any Order");
|
| 89 |
$url = 'rma/index/request';
|
|
@@ -189,11 +199,14 @@ class Jayje_Rma_IndexController extends Mage_Core_Controller_Front_Action
|
|
| 189 |
$customer = $session->getCustomer();
|
| 190 |
$by = $customer->getName();
|
| 191 |
}
|
| 192 |
-
|
| 193 |
-
|
| 194 |
-
|
| 195 |
-
|
| 196 |
-
|
|
|
|
|
|
|
|
|
|
| 197 |
$this->loadLayout();
|
| 198 |
$message = $this->__('Your comment has been submitted');
|
| 199 |
Mage::getSingleton('core/session')->addSuccess($message);
|
| 44 |
|
| 45 |
$created_time = date("Y-m-d g:i:s");
|
| 46 |
$arrParams = $this->getRequest()->getParams();
|
| 47 |
+
print_r($arrParams); ;
|
| 48 |
|
| 49 |
$customername =Mage::helper('customer')->getCustomer()->getName();
|
| 50 |
$customerid =Mage::helper('customer')->getCustomer()->getData('entity_id') ;
|
| 51 |
$email =Mage::helper('customer')->getCustomer()->getData('email') ;
|
|
|
|
| 52 |
$order_id = $arrParams['order_id'];
|
| 53 |
if($order_id !=''){
|
| 54 |
+
$maxpid = $arrParams['maxpid'];
|
| 55 |
+
|
| 56 |
+
for ($i=0; $i<=$maxpid; $i++){
|
| 57 |
+
$qty = $arrParams['qty_'.$i];
|
| 58 |
+
if($qty>0){
|
| 59 |
+
$reason = $arrParams['reason'];
|
| 60 |
$package = $arrParams['package'];
|
| 61 |
$return_type = $arrParams['return_type'];
|
| 62 |
$increment_id = Mage::getModel('sales/order')->load($order_id)->getData('increment_id');
|
| 63 |
+
$initialstatus = Mage::getStoreConfig('jayje_section/jayje_group/jayje_basicstatus',Mage::app()->getStore());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 64 |
|
| 65 |
+
$rma = Mage::getsingleton('rma/rma');
|
| 66 |
+
|
| 67 |
+
$rma->setData($arrParams)
|
| 68 |
+
->setAdminstatus($initialstatus)
|
| 69 |
+
->setIncrementId($increment_id)
|
| 70 |
+
->setEmail($email)
|
| 71 |
+
->setCustomerId($customerid)
|
| 72 |
+
->setCreatedTime(now())
|
| 73 |
+
->setUpdateTime(now())
|
| 74 |
+
->save();
|
| 75 |
+
|
| 76 |
+
$lastInsertId = $rma->getId();
|
| 77 |
|
| 78 |
+
$pid = $arrParams['pid_'.$i];
|
| 79 |
+
$total = $arrParams['price_'.$i] * $qty;
|
| 80 |
+
$rproducts = Mage::getModel('rma/rproducts')
|
| 81 |
+
->setRmaid($lastInsertId)
|
| 82 |
+
->setOrderId($order_id)
|
| 83 |
+
->setProductId($pid)
|
| 84 |
+
->setQty($qty)
|
| 85 |
+
->setTotal($total)
|
| 86 |
+
->save();
|
| 87 |
+
|
| 88 |
+
}else{
|
| 89 |
+
// $message = $this->__('Sorry, We couldnot save your request');
|
| 90 |
+
// $url = 'rma/index/request';
|
| 91 |
+
}
|
| 92 |
+
}
|
| 93 |
|
| 94 |
+
$message = $this->__('Your request has been sent');
|
| 95 |
+
$url = "rma/index/view/rma_id/".$lastInsertId;
|
| 96 |
+
|
| 97 |
}else{
|
| 98 |
$message = $this->__("Sorry, You don't have any Order");
|
| 99 |
$url = 'rma/index/request';
|
| 199 |
$customer = $session->getCustomer();
|
| 200 |
$by = $customer->getName();
|
| 201 |
}
|
| 202 |
+
$model1 = Mage::getModel('rma/rcomments');
|
| 203 |
+
$model1->setRmaid($rma_id);
|
| 204 |
+
$model1->setStype('Comments');
|
| 205 |
+
$model1->setComments($comments);
|
| 206 |
+
$model1->setDate($update_time);
|
| 207 |
+
$model1->setBy($by);
|
| 208 |
+
$model1->save();
|
| 209 |
+
|
| 210 |
$this->loadLayout();
|
| 211 |
$message = $this->__('Your comment has been submitted');
|
| 212 |
Mage::getSingleton('core/session')->addSuccess($message);
|
app/code/community/jayje/Rma/etc/config.xml
CHANGED
|
@@ -35,25 +35,25 @@
|
|
| 35 |
</routers>
|
| 36 |
</admin>
|
| 37 |
<adminhtml>
|
| 38 |
-
<menu>
|
| 39 |
-
<rma module="rma">
|
| 40 |
-
<title>RMA</title>
|
| 41 |
-
<sort_order>71</sort_order>
|
| 42 |
-
<children>
|
| 43 |
-
|
| 44 |
-
<items module="rma">
|
| 45 |
-
<title>Manage RMA</title>
|
| 46 |
-
<sort_order>0</sort_order>
|
| 47 |
-
<action>rma/adminhtml_rma</action>
|
| 48 |
-
</items>
|
| 49 |
-
<rstatus module="rma">
|
| 50 |
-
<title>RMA Status and Return Type</title>
|
| 51 |
-
<sort_order>10</sort_order>
|
| 52 |
-
<action>rma/adminhtml_rstatus</action>
|
| 53 |
-
</rstatus>
|
| 54 |
-
</children>
|
| 55 |
-
</rma>
|
| 56 |
-
</menu>
|
| 57 |
<acl>
|
| 58 |
<resources>
|
| 59 |
<all>
|
|
@@ -89,9 +89,15 @@
|
|
| 89 |
<rma>
|
| 90 |
<table>rma</table>
|
| 91 |
</rma>
|
| 92 |
-
|
| 93 |
-
|
| 94 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 95 |
</entities>
|
| 96 |
</rma_mysql4>
|
| 97 |
</models>
|
| 35 |
</routers>
|
| 36 |
</admin>
|
| 37 |
<adminhtml>
|
| 38 |
+
<menu>
|
| 39 |
+
<rma module="rma">
|
| 40 |
+
<title>RMA</title>
|
| 41 |
+
<sort_order>71</sort_order>
|
| 42 |
+
<children>
|
| 43 |
+
|
| 44 |
+
<items module="rma">
|
| 45 |
+
<title>Manage RMA</title>
|
| 46 |
+
<sort_order>0</sort_order>
|
| 47 |
+
<action>rma/adminhtml_rma</action>
|
| 48 |
+
</items>
|
| 49 |
+
<rstatus module="rma">
|
| 50 |
+
<title>RMA Status and Return Type</title>
|
| 51 |
+
<sort_order>10</sort_order>
|
| 52 |
+
<action>rma/adminhtml_rstatus</action>
|
| 53 |
+
</rstatus>
|
| 54 |
+
</children>
|
| 55 |
+
</rma>
|
| 56 |
+
</menu>
|
| 57 |
<acl>
|
| 58 |
<resources>
|
| 59 |
<all>
|
| 89 |
<rma>
|
| 90 |
<table>rma</table>
|
| 91 |
</rma>
|
| 92 |
+
<rcomments>
|
| 93 |
+
<table>rma_comments</table>
|
| 94 |
+
</rcomments>
|
| 95 |
+
<rproducts>
|
| 96 |
+
<table>rma_products</table>
|
| 97 |
+
</rproducts>
|
| 98 |
+
<rstatus>
|
| 99 |
+
<table>rstatus</table>
|
| 100 |
+
</rstatus>
|
| 101 |
</entities>
|
| 102 |
</rma_mysql4>
|
| 103 |
</models>
|
app/code/community/jayje/Rma/etc/system.xml
CHANGED
|
@@ -33,6 +33,16 @@
|
|
| 33 |
<show_in_store>1</show_in_store>
|
| 34 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 35 |
</jayje_rmamail>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 36 |
<jayje_mail translate="label">
|
| 37 |
<label>Send Email to customer: </label>
|
| 38 |
<comment>When RMA Request is created</comment>
|
| 33 |
<show_in_store>1</show_in_store>
|
| 34 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 35 |
</jayje_rmamail>
|
| 36 |
+
<jayje_basicstatus translate="label">
|
| 37 |
+
<label>Intial RMA Status: </label>
|
| 38 |
+
<comment>When RMA Request is created</comment>
|
| 39 |
+
<frontend_type>select</frontend_type>
|
| 40 |
+
<sort_order>10</sort_order>
|
| 41 |
+
<show_in_default>1</show_in_default>
|
| 42 |
+
<show_in_website>1</show_in_website>
|
| 43 |
+
<show_in_store>1</show_in_store>
|
| 44 |
+
<source_model>rma/config_status</source_model>
|
| 45 |
+
</jayje_basicstatus>
|
| 46 |
<jayje_mail translate="label">
|
| 47 |
<label>Send Email to customer: </label>
|
| 48 |
<comment>When RMA Request is created</comment>
|
app/code/community/jayje/Rma/sql/Rma_setup/mysql4-install-0.1.0.php
CHANGED
|
@@ -21,23 +21,22 @@ $installer->run("
|
|
| 21 |
|
| 22 |
-- DROP TABLE IF EXISTS {$this->getTable('rma')};
|
| 23 |
CREATE TABLE {$this->getTable('rma')} (
|
| 24 |
-
`rma_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
| 25 |
`title` varchar(255) NOT NULL DEFAULT '',
|
| 26 |
-
`filename` varchar(255) NOT NULL DEFAULT '',
|
| 27 |
`content` text NOT NULL,
|
| 28 |
-
`status` smallint(6) NOT NULL DEFAULT '0',
|
| 29 |
`created_time` datetime DEFAULT NULL,
|
| 30 |
`update_time` datetime DEFAULT NULL,
|
| 31 |
`customer_id` varchar(20) NOT NULL,
|
| 32 |
`order_id` int(20) NOT NULL,
|
| 33 |
`reason` varchar(255) NOT NULL,
|
| 34 |
`email` varchar(30) NOT NULL,
|
|
|
|
| 35 |
`return_type` varchar(20) NOT NULL,
|
| 36 |
`package` varchar(11) NOT NULL,
|
| 37 |
`increment_id` int(30) NOT NULL,
|
| 38 |
-
`
|
| 39 |
PRIMARY KEY (`rma_id`)
|
| 40 |
-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=
|
| 41 |
|
| 42 |
CREATE TABLE IF NOT EXISTS `rma_comments` (
|
| 43 |
`id` int(11) NOT NULL AUTO_INCREMENT,
|
| 21 |
|
| 22 |
-- DROP TABLE IF EXISTS {$this->getTable('rma')};
|
| 23 |
CREATE TABLE {$this->getTable('rma')} (
|
| 24 |
+
`rma_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
| 25 |
`title` varchar(255) NOT NULL DEFAULT '',
|
|
|
|
| 26 |
`content` text NOT NULL,
|
|
|
|
| 27 |
`created_time` datetime DEFAULT NULL,
|
| 28 |
`update_time` datetime DEFAULT NULL,
|
| 29 |
`customer_id` varchar(20) NOT NULL,
|
| 30 |
`order_id` int(20) NOT NULL,
|
| 31 |
`reason` varchar(255) NOT NULL,
|
| 32 |
`email` varchar(30) NOT NULL,
|
| 33 |
+
`tracking_no` varchar(30) NOT NULL,
|
| 34 |
`return_type` varchar(20) NOT NULL,
|
| 35 |
`package` varchar(11) NOT NULL,
|
| 36 |
`increment_id` int(30) NOT NULL,
|
| 37 |
+
`adminstatus` varchar(30) NOT NULL,
|
| 38 |
PRIMARY KEY (`rma_id`)
|
| 39 |
+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=65 ;
|
| 40 |
|
| 41 |
CREATE TABLE IF NOT EXISTS `rma_comments` (
|
| 42 |
`id` int(11) NOT NULL AUTO_INCREMENT,
|
app/design/frontend/default/default/template/rma/request.phtml
CHANGED
|
@@ -54,6 +54,10 @@ Return Type<br />
|
|
| 54 |
<?php echo $this->getRType(); ?>
|
| 55 |
</select><br /><br />
|
| 56 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 57 |
Reason<br />
|
| 58 |
<textarea cols="60" rows="6" name="reason"></textarea><br /><br />
|
| 59 |
<button onclick="return notEmpty()" type="submit" title="Submit" class="button translate-inline" translate="[{shown:'Submit',translated:'Submit',original:'Submit',location:'Tag attribute (ALT, TITLE, etc.)',scope:'Mage_Customer'},{shown:'Submit',translated:'Submit',original:'Submit',location:'Push button',scope:'Mage_Customer'}]"><span><span>Submit</span></span></button>
|
| 54 |
<?php echo $this->getRType(); ?>
|
| 55 |
</select><br /><br />
|
| 56 |
|
| 57 |
+
Tracking No<br />
|
| 58 |
+
<input type='text' name="tracking_no" /><br /><br />
|
| 59 |
+
|
| 60 |
+
|
| 61 |
Reason<br />
|
| 62 |
<textarea cols="60" rows="6" name="reason"></textarea><br /><br />
|
| 63 |
<button onclick="return notEmpty()" type="submit" title="Submit" class="button translate-inline" translate="[{shown:'Submit',translated:'Submit',original:'Submit',location:'Tag attribute (ALT, TITLE, etc.)',scope:'Mage_Customer'},{shown:'Submit',translated:'Submit',original:'Submit',location:'Push button',scope:'Mage_Customer'}]"><span><span>Submit</span></span></button>
|
app/design/frontend/default/default/template/rma/ritem.phtml
CHANGED
|
@@ -74,7 +74,7 @@ foreach ($items as $itemId => $item)
|
|
| 74 |
<?php if($tf>0){ ?>
|
| 75 |
Already Requested
|
| 76 |
<?php }else{ ?>
|
| 77 |
-
<input type="text" id="rma<?php echo $item->getProductId() ?>" size="2" name="qty_<?php echo $itemId; ?>" value="
|
| 78 |
<?php } ?>
|
| 79 |
|
| 80 |
<input type="hidden" size="2" name="pid_<?php echo $itemId; ?>" value="<?php echo $item->getProductId() ?>" /></td>
|
| 74 |
<?php if($tf>0){ ?>
|
| 75 |
Already Requested
|
| 76 |
<?php }else{ ?>
|
| 77 |
+
<input type="text" id="rma<?php echo $item->getProductId() ?>" size="2" name="qty_<?php echo $itemId; ?>" value="0" autocomplete="off" onkeyup="return checkQty(<?php echo $item->getProductId() ?>)" />
|
| 78 |
<?php } ?>
|
| 79 |
|
| 80 |
<input type="hidden" size="2" name="pid_<?php echo $itemId; ?>" value="<?php echo $item->getProductId() ?>" /></td>
|
app/design/frontend/default/default/template/rma/view.phtml
CHANGED
|
@@ -16,7 +16,7 @@
|
|
| 16 |
$rma = $this->getRmaDetails();
|
| 17 |
?>
|
| 18 |
<div class="page-title title-buttons">
|
| 19 |
-
<h1>RMA #<?php echo $rma['rma_id']; ?> - <?php echo $rma['
|
| 20 |
</div>
|
| 21 |
<a href="<?php echo Mage::helper('core/url')->getHomeUrl(); ?>/rma/index/"><h4 align="right">Back to RMA</h4></a>
|
| 22 |
|
|
@@ -31,9 +31,12 @@
|
|
| 31 |
</div>
|
| 32 |
<div class="box-content">
|
| 33 |
Order: <a href="<?php echo Mage::helper('core/url')->getHomeUrl()."/sales/order/view/order_id/".$rma['order_id']; ?>" >#<?php echo $rma['increment_id']; ?></a>
|
| 34 |
-
</div>
|
| 35 |
<div class="box-content">
|
| 36 |
-
Status: <?php echo $rma['
|
|
|
|
|
|
|
|
|
|
| 37 |
</div>
|
| 38 |
<div class="box-content">
|
| 39 |
Reason: <?php echo $rma['reason']; ?>
|
| 16 |
$rma = $this->getRmaDetails();
|
| 17 |
?>
|
| 18 |
<div class="page-title title-buttons">
|
| 19 |
+
<h1>RMA #<?php echo $rma['rma_id']; ?> - <?php echo $rma['adminstatus']; ?></h1>
|
| 20 |
</div>
|
| 21 |
<a href="<?php echo Mage::helper('core/url')->getHomeUrl(); ?>/rma/index/"><h4 align="right">Back to RMA</h4></a>
|
| 22 |
|
| 31 |
</div>
|
| 32 |
<div class="box-content">
|
| 33 |
Order: <a href="<?php echo Mage::helper('core/url')->getHomeUrl()."/sales/order/view/order_id/".$rma['order_id']; ?>" >#<?php echo $rma['increment_id']; ?></a>
|
| 34 |
+
</div>
|
| 35 |
<div class="box-content">
|
| 36 |
+
Status: <?php echo $rma['adminstatus']; ?>
|
| 37 |
+
</div>
|
| 38 |
+
<div class="box-content">
|
| 39 |
+
Tracking No: <?php echo $rma['tracking_no']; ?>
|
| 40 |
</div>
|
| 41 |
<div class="box-content">
|
| 42 |
Reason: <?php echo $rma['reason']; ?>
|
package.xml
CHANGED
|
@@ -1,15 +1,14 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Jayje</name>
|
| 4 |
-
<version>1.00.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>wakensys</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
-
<summary>Return
|
| 10 |
-
<description>
|
| 11 |
-
<notes
|
| 12 |
-
* Jayje_Rma extension
|
| 13 |
* 
|
| 14 |
* @category Return Merchant Authorization Magento - wakensys
|
| 15 |
* @package Jayje_Rma
|
|
@@ -21,9 +20,9 @@
|
|
| 21 |
* @developper s.ratheepan@gmail.com
|
| 22 |
</notes>
|
| 23 |
<authors><author><name>wakensys</name><user>wakensys</user><email>admin@wakensys.com</email></author><author><name>ratheepan s</name><user>ratheepan</user><email>s.ratheepan@gmail.com</email></author></authors>
|
| 24 |
-
<date>2013-01-
|
| 25 |
-
<time>
|
| 26 |
-
<contents><target name="magecommunity"><dir name="jayje"><dir name="Rma"><dir name="Block"><dir name="Adminhtml"><dir name="Rma"><dir name="Edit"><file name="Form.php" hash="c17dda020eea0e35655c6c3d936b4e4d"/><dir name="Tab"><file name="Comments.php" hash="2c2d455204298e9275b9ea22f921af44"/><file name="Form.php" hash="
|
| 27 |
<compatible/>
|
| 28 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 29 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Jayje</name>
|
| 4 |
+
<version>1.00.20</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>wakensys</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
+
<summary>Return Me, rchant Authorization</summary>
|
| 10 |
+
<description>bugs fixed, Full entity support and some features included</description>
|
| 11 |
+
<notes> * Jayje_Rma extension
|
|
|
|
| 12 |
* 
|
| 13 |
* @category Return Merchant Authorization Magento - wakensys
|
| 14 |
* @package Jayje_Rma
|
| 20 |
* @developper s.ratheepan@gmail.com
|
| 21 |
</notes>
|
| 22 |
<authors><author><name>wakensys</name><user>wakensys</user><email>admin@wakensys.com</email></author><author><name>ratheepan s</name><user>ratheepan</user><email>s.ratheepan@gmail.com</email></author></authors>
|
| 23 |
+
<date>2013-01-09</date>
|
| 24 |
+
<time>05:05:02</time>
|
| 25 |
+
<contents><target name="magecommunity"><dir name="jayje"><dir name="Rma"><dir name="Block"><dir name="Adminhtml"><dir name="Rma"><dir name="Edit"><file name="Form.php" hash="c17dda020eea0e35655c6c3d936b4e4d"/><dir name="Tab"><file name="Comments.php" hash="2c2d455204298e9275b9ea22f921af44"/><file name="Form.php" hash="cb2862bc76d3771c83bee9c06fa33ef2"/><file name="Order.php" hash="321cc9771d4f395cbdfd7cc7987c444b"/></dir><file name="Tabs.php" hash="b98372c342c3283720f4c498fbe5ff96"/></dir><file name="Edit.php" hash="acffce78658a4feaa64f16df705edcb0"/><file name="Grid.php" hash="54596d790e64904cb33ec2ab2024aab3"/><file name="Info.php" hash="6b1cc7816adbaebc644bea85361641a2"/></dir><file name="Rma.php" hash="2f06c3c3193b9e9b285d4bfb0ea4e79c"/><dir name="Rstatus"><dir name="Edit"><file name="Form.php" hash="179b8c8f9a0ce4bc1f7dd77f4462929d"/><dir name="Tab"><file name="Form.php" hash="195281b00db9345f6cda629d6dd90fa7"/></dir><file name="Tabs.php" hash="f32eec6f49b792e05db98beb388f1aa5"/></dir><file name="Edit.php" hash="64cc94fd3c728ab47e46e3e0bfd406fd"/><file name="Grid.php" hash="a3a492f66c92dc5409b098d0d4878fbb"/></dir><file name="Rstatus.php" hash="fd615a7d2cd20da9d1a9a0ebdcbccf2b"/></dir><file name="Ajax.php" hash="9d6962522f37f14e3862d4237e4ad353"/><file name="Rma.php" hash="c6b7034bea7ff9bdc8a10e2c08656567"/></dir><dir name="Controller"><dir name="Adminhtml"><file name="Rma.php" hash="11690815008d3afb6e8620d07bb9fd61"/></dir></dir><dir name="Helper"><file name="Data.php" hash="93aa9730afa6fba2232ede4393be8275"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Rcomments"><file name="Collection.php" hash="61811ba914638703ea1ca74e4048ee6b"/></dir><file name="Rcomments.php" hash="53317fd8d43703c86667523e898af74c"/><dir name="Rma"><file name="Collection.php" hash="e7b5aeb3ed76ebfc81ddbc39a9d656ef"/></dir><file name="Rma.php" hash="d947b8498e305f0f40ec085e7982774c"/><dir name="Rproducts"><file name="Collection.php" hash="627fb76b1c4c497a66ba2101882dea96"/></dir><file name="Rproducts.php" hash="f70ea73d161c6c9646dd5d9b64da9e95"/><dir name="Rstatus"><file name="Collection.php" hash="1bd6110583bb244668c9c70eaa34f253"/></dir><file name="Rstatus.php" hash="ac299021684b8ab9c4257b4dbfc9cafc"/></dir><file name="Rcomments.php" hash="4f2b408aed3a310ab70d11188a5b6899"/><file name="Rma.php" hash="ddd840e73f7a633d71c405b94e42d5bd"/><file name="Rproducts.php" hash="a520c1d7d2af7921f25a8774d80d1183"/><file name="Rstatus.php" hash="83f848c66cc76f6e876e887ce8657e22"/><file name="Status.php" hash="67d0514d440066d1fdef19debd8bf5bf"/><dir name="config"><file name="Returntype.php" hash="b45375f67bd4137aea729f1b74eedaa3"/><file name="Status.php" hash="5c087385d389ee7710a2f717eb9773d2"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="RmaController.php" hash="c05b3491da5fc6e2df4c15036cd9a4ac"/><file name="RstatusController.php" hash="0cefdd66b97b922f5e44aa446c7dc9eb"/></dir><file name="IndexController.php" hash="6875a2f96c55456cbc8645df7e63a24e"/></dir><dir name="etc"><file name="adminhtml.xml" hash="d1d774f537d3aaa91df1b1b3c22e5d08"/><file name="config.xml" hash="b1bf4e70eca649f574ea587a94a89a28"/><file name="system.xml" hash="f498d8a6bcc1216b7789050d9354ec41"/></dir><dir name="sql"><dir name="Rma_setup"><file name="mysql4-install-0.1.0.php" hash="65a95b9c69c885e56271d871e6549e72"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="rma.xml" hash="0a4553f71ad996d10db5e15a764b0e2c"/></dir><dir name="template"><dir name="rma"><file name="comments.phtml" hash="b2a0ade4d36b658f0f6a044e5c0cefba"/><file name="info.phtml" hash="b4ea9b9a0ca3f5e4d78957f44618ad55"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="rma.xml" hash="e38cc9f629b81a89f4ee1f0a2d61a18c"/></dir><dir name="template"><dir name="rma"><file name="request.phtml" hash="500a313cac5b0384c34f24b388862d70"/><file name="ritem.phtml" hash="aeaf5a037a087ec30e35faba41cb73e5"/><file name="rma.phtml" hash="1a444cce844534c5c89b85b1fb67c571"/><file name="view.phtml" hash="98505728afde900c2b1c5701b84c1f67"/></dir></dir></dir></dir></dir></target><target name="mage"><dir name="js"><file name="jquery-1.4.2.js" hash="10092eee563dec2dca82b77d2cf5a1ae"/></dir><dir name="app"><dir name="etc"><dir name="modules"><file name="Jayje_Rma.xml" hash="6efd4aedf8b0e86df813eec41919030a"/></dir></dir></dir></target></contents>
|
| 26 |
<compatible/>
|
| 27 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 28 |
</package>
|
