Merge pull request #1 from sandstein/master

upgrades to version 17.4.2

Author: Flyingmana

app/code/community/Netresearch/OPS/Block/Adminhtml/Kwixo/Shipping/Edit.php

@@ -39,6 +39,7 @@ public function getShippingMethods()
             if (!$title = Mage::getStoreConfig("carriers/$carrierCode/title")) {
                 $title = $carrierCode;
             }
+
             $values = $this->getValues($carrierCode);
             $options[] = array('code' => $carrierCode, 'label' => $title, 'values' => $values);
         }
@@ -61,6 +62,7 @@ public function getKwixoShippingSettingModel()
         if (null === $this->kwxioShippingModel) {
             $this->kwixoShippingModel = Mage::getModel('ops/kwixo_shipping_setting');
         }
+
         return $this->kwixoShippingModel;
     }
 
@@ -81,6 +83,7 @@ protected function getValues($carrierCode)
         } else {
             $values = $this->getKwixoShippingSettingModel()->load($carrierCode, 'shipping_code')->getData();
         }
+
         return $values;
     }
 }

app/code/community/Netresearch/OPS/Block/Adminhtml/Kwixocategory/CategoryTree.php

@@ -68,6 +68,7 @@ protected function _getNodeJson($node, $level = 0)
         if ((int) $node->getChildrenCount() > 0) {
             $item['children'] = array();
         }
+
         $isParent = $this->_isParentSelectedCategory($node);
         if ($node->hasChildren()) {
             $item['children'] = array();
@@ -81,6 +82,7 @@ protected function _getNodeJson($node, $level = 0)
         if ($isParent || $node->getLevel() < 2) {
             $item['expanded'] = true;
         }
+
         return $item;
     }
 
@@ -94,6 +96,7 @@ protected function _getProductTypeLabel($productTypeId)
                 break;
             }
         }
+
         return $res;
     }
 

app/code/community/Netresearch/OPS/Block/Adminhtml/Kwixocategory/Edit.php

@@ -47,6 +47,7 @@ public function getHeaderText()
         if ($categoryId <= 0) {
             return Mage::helper('ops/data')->__('Categories configuration');
         }
+
         $category = Mage::getModel('catalog/category')->load($categoryId);
         return Mage::helper('ops/data')->__("Categorie's %s configuration", $category->getName());
     }

app/code/community/Netresearch/OPS/Block/Adminhtml/Kwixocategory/Edit/Form.php

@@ -17,6 +17,7 @@ protected function _prepareForm()
         if ($categoryId <= 0) {
             return parent::_prepareForm();
         }
+
         $kwixoCategoryMapping = Mage::getModel('ops/kwixo_category_mapping')->loadByCategoryId($categoryId);
         $storeId = (int) $this->getRequest()->getParam('store');
 

…Creditmemo/ClosedTransaction/Warning.php …Creditmemo/ClosedTransaction/Warning.phpapp/code/community/Netresearch/OPS/Block/Adminhtml/Sales/Order/Creditmemo/ClosedTransaction/Warning.php renamed to app/code/community/Netresearch/OPS/Block/Adminhtml/Sales/Creditmemo/ClosedTransaction/Warning.php app/code/community/Netresearch/OPS/Block/Adminhtml/Sales/Order/Creditmemo/ClosedTransaction/Warning.php renamed to app/code/community/Netresearch/OPS/Block/Adminhtml/Sales/Creditmemo/ClosedTransaction/Warning.php

@@ -15,7 +15,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class Netresearch_OPS_Block_Adminhtml_Sales_Order_Creditmemo_ClosedTransaction_Warning
+class Netresearch_OPS_Block_Adminhtml_Sales_Creditmemo_ClosedTransaction_Warning
     extends Mage_Core_Block_Template
 {
 
@@ -27,7 +27,8 @@ class Netresearch_OPS_Block_Adminhtml_Sales_Order_Creditmemo_ClosedTransaction_W
     protected function _construct()
     {
         parent::_construct();
-        $this->setTemplate('ops/sales/order/creditmemo/closed-transaction/warning.phtml');
+        $this->setTemplate('ops/sales/creditmemo/closed-transaction/warning.phtml');
+
     }
 
 }

…les/Order/Creditmemo/Totals/Checkbox.php …tml/Sales/Creditmemo/Totals/Checkbox.phpapp/code/community/Netresearch/OPS/Block/Adminhtml/Sales/Order/Creditmemo/Totals/Checkbox.php renamed to app/code/community/Netresearch/OPS/Block/Adminhtml/Sales/Creditmemo/Totals/Checkbox.php app/code/community/Netresearch/OPS/Block/Adminhtml/Sales/Order/Creditmemo/Totals/Checkbox.php renamed to app/code/community/Netresearch/OPS/Block/Adminhtml/Sales/Creditmemo/Totals/Checkbox.php

@@ -15,7 +15,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class Netresearch_OPS_Block_Adminhtml_Sales_Order_Creditmemo_Totals_Checkbox
+class Netresearch_OPS_Block_Adminhtml_Sales_Creditmemo_Totals_Checkbox
     extends Mage_Core_Block_Template
 {
 
@@ -27,7 +27,7 @@ class Netresearch_OPS_Block_Adminhtml_Sales_Order_Creditmemo_Totals_Checkbox
     protected function _construct()
     {
         parent::_construct();
-        $this->setTemplate('ops/sales/order/creditmemo/totals/checkbox.phtml');
+        $this->setTemplate('ops/sales/creditmemo/totals/checkbox.phtml');
     }
 
 }

app/code/community/Netresearch/OPS/Block/Alias/List.php

@@ -25,10 +25,9 @@ public function getAliases()
         $customer = Mage::helper('customer')->getCustomer();
         if (0 < $customer->getId()) {
             $aliasesCollection = Mage::helper('ops/alias')->getAliasesForCustomer($customer->getId());
-            foreach ($aliasesCollection as $alias) {
-                $aliases[] = $alias;
-            }
+            $aliases = $aliasesCollection->getItems();
         }
+
         return $aliases;
     }
 
@@ -40,13 +39,7 @@ public function getAliases()
      */
     public function getMethodName($methodCode)
     {
-        $title = '';
-        $instance = Mage::helper('payment')->getMethodInstance($methodCode);
-        if ($instance) {
-            $title = $instance->getTitle();
-        }
-
-        return $title;
+        return Mage::getStoreConfig('payment/'.$methodCode.'/title');
     }
 
     /**

app/code/community/Netresearch/OPS/Block/Checkout/SubscriptionNotice.php

@@ -139,6 +139,7 @@ public function getRegularSubscriptionText()
                 $this->localizeDate($this->getRegularSubscriptionEndDate())
             );
         }
+
         return $message;
     }
 
@@ -186,6 +187,7 @@ protected function getRegularSubscriptionEndDate()
         } else {
             $startDate = new DateTime($this->getProfile()->getStartDatetime());
         }
+
         $enddate = $parameterModel->calculateEndDate(
             $startDate, $this->getProfile()->getPeriodUnit(),
             $this->getProfile()->getPeriodFrequency(), $this->getProfile()->getPeriodMaxCycles()

app/code/community/Netresearch/OPS/Block/Form.php

@@ -33,7 +33,7 @@ class Netresearch_OPS_Block_Form extends Mage_Payment_Block_Form_Cc
 
     protected $config = null;
 
-    protected $_aliasDataForCustomer = array();
+    protected $aliasDataForCustomer = array();
 
     /**
      * Frontend Payment Template
@@ -240,7 +240,7 @@ public function getRedirectMessage()
      * @return array | null - array the alias data or null if the customer
      * is not logged in
      */
-    protected function getStoredAliasForCustomer()
+    public function getStoredAliasForCustomer()
     {
         if (Mage::helper('customer/data')->isLoggedIn()
             && Mage::getModel('ops/config')->isAliasManagerEnabled($this->getMethodCode())
@@ -256,11 +256,11 @@ protected function getStoredAliasForCustomer()
 
 
             foreach ($aliases as $key => $alias) {
-                $this->_aliasDataForCustomer[$key] = $alias;
+                $this->aliasDataForCustomer[$key] = $alias;
             }
         }
 
-        return $this->_aliasDataForCustomer;
+        return $this->aliasDataForCustomer;
     }
 
     /**
@@ -347,10 +347,10 @@ protected function getStoredAliasDataForCustomer($aliasId, $key)
         $returnValue = null;
         $aliasData   = array();
 
-        if (empty($this->_aliasDataForCustomer)) {
+        if (empty($this->aliasDataForCustomer)) {
             $aliasData = $this->getStoredAliasForCustomer();
         } else {
-            $aliasData = $this->_aliasDataForCustomer;
+            $aliasData = $this->aliasDataForCustomer;
         }
 
         if (array_key_exists($aliasId, $aliasData) && $aliasData[$aliasId]->hasData($key)) {
@@ -360,4 +360,42 @@ protected function getStoredAliasDataForCustomer($aliasId, $key)
         return $returnValue;
     }
 
+    /**
+     * @param $methodCode
+     * @param $storeId
+     * @return mixed|string
+     */
+    public function getHtpTemplateName($methodCode, $storeId = null)
+    {
+        return $this->getConfig()->getHtpTemplateName($methodCode, $storeId);
+    }
+
+    /**
+     * get customer birthdate and gender
+     *
+     * @return array
+     */
+    public function getCustomerData()
+    {
+        $data = array();
+        $quote = $this->getQuote();
+        $birthDate = $quote->getCustomerDob();
+        $gender = $quote->getCustomerGender();
+
+        $data['birthdate'] = isset($birthDate) ? $birthDate : '';
+        $data['gender'] = isset($gender) ? $gender : '';
+
+        return $data;
+    }
+
+    public function getGenderOptions()
+    {
+        $genders = Mage::getSingleton('eav/config')
+            ->getAttribute('customer', 'gender')
+            ->getSource()
+            ->getAllOptions();
+
+        return $genders;
+
+    }
 }