Move templates from 'bankpayment' to 'phoenix/bankpayment' and resolv…

…ed merge conflicts
PHOENIX-MEDIA · Jan 10, 2018 · 3f1e3aa · 3f1e3aa
1 parent 639ebb4
commit 3f1e3aa
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 8 deletions.
diff --git a/app/code/community/Phoenix/BankPayment/Block/Form.php b/app/code/community/Phoenix/BankPayment/Block/Form.php
@@ -20,14 +20,20 @@ class Phoenix_BankPayment_Block_Form extends Mage_Payment_Block_Form
     protected function _construct()
     {
         parent::_construct();
-        $this->setTemplate('bankpayment/form.phtml');
+        $this->setTemplate('phoenix/bankpayment/form.phtml');
     }
 
+    /**
+     * @return string
+     */
     public function getCustomFormBlockType()
     {
         return $this->getMethod()->getConfigData('form_block_type');
     }
 
+    /**
+     * @return string
+     */
     public function getFormCmsUrl()
     {
         $pageUrl = null;
@@ -40,11 +46,18 @@ public function getFormCmsUrl()
         return $pageUrl;
     }
 
+    /**
+     * @return array
+     */
     public function getAccounts()
     {
         return $this->getMethod()->getAccounts();
     }
 
+    /**
+     * @param boolean $addNl2Br
+     * @return string
+     */
     public function getCustomText($addNl2Br = true)
     {
         return $this->getMethod()->getCustomText($addNl2Br);

diff --git a/app/code/community/Phoenix/BankPayment/Block/Info.php b/app/code/community/Phoenix/BankPayment/Block/Info.php
@@ -15,29 +15,40 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
 class Phoenix_BankPayment_Block_Info extends Mage_Payment_Block_Info
 {
     protected function _construct()
     {
         parent::_construct();
-        $this->setTemplate('bankpayment/info.phtml');
+        $this->setTemplate('phoenix/bankpayment/info.phtml');
     }
 
+    /**
+     * @return string
+     */
     public function toPdf()
     {
-        $this->setTemplate('bankpayment/pdf/info.phtml');
+        $this->setTemplate('phoenix/bankpayment/pdf/info.phtml');
         return $this->toHtml();
     }
 
+    /**
+     * @return array
+     */
     public function getAccounts() {
         return $this->getMethod()->getAccounts();
     }
 
+    /**
+     * @return string
+     */
     public function getShowBankAccountsInPdf() {
         return $this->getMethod()->getConfigData('show_bank_accounts_in_pdf');
     }
 
+    /**
+     * @return string
+     */
     public function getShowCustomTextInPdf() {
         return $this->getMethod()->getConfigData('show_customtext_in_pdf');
     }

diff --git a/...t/default/template/bankpayment/form.phtml → ...t/template/phoenix/bankpayment/form.phtml b/...t/default/template/bankpayment/form.phtml → ...t/template/phoenix/bankpayment/form.phtml
diff --git a/...t/default/template/bankpayment/info.phtml → ...t/template/phoenix/bankpayment/info.phtml b/...t/default/template/bankpayment/info.phtml → ...t/template/phoenix/bankpayment/info.phtml
diff --git a/...fault/template/bankpayment/pdf/info.phtml → ...mplate/phoenix/bankpayment/pdf/info.phtml b/...fault/template/bankpayment/pdf/info.phtml → ...mplate/phoenix/bankpayment/pdf/info.phtml
diff --git a/...e/default/template/bankpayment/form.phtml → ...t/template/phoenix/bankpayment/form.phtml b/...e/default/template/bankpayment/form.phtml → ...t/template/phoenix/bankpayment/form.phtml
diff --git a/...e/default/template/bankpayment/info.phtml → ...t/template/phoenix/bankpayment/info.phtml b/...e/default/template/bankpayment/info.phtml → ...t/template/phoenix/bankpayment/info.phtml
diff --git a/...fault/template/bankpayment/pdf/info.phtml → ...mplate/phoenix/bankpayment/pdf/info.phtml b/...fault/template/bankpayment/pdf/info.phtml → ...mplate/phoenix/bankpayment/pdf/info.phtml
diff --git a/composer.json b/composer.json
@@ -16,8 +16,8 @@
     "map": [
       ["app/code/community/Phoenix/BankPayment/*", "app/code/community/Phoenix/BankPayment/"],
       ["app/etc/modules/Phoenix_BankPayment.xml", "app/etc/modules/Phoenix_BankPayment.xml"],
-      ["app/design/adminhtml/default/default/template/bankpayment/*", "app/design/adminhtml/default/default/template/bankpayment/"],
-      ["app/design/frontend/base/default/template/bankpayment/*", "app/design/frontend/base/default/template/bankpayment/"],
+      ["app/design/adminhtml/default/default/template/phoenix/bankpayment/*", "app/design/adminhtml/default/default/template/phoenix/bankpayment/"],
+      ["app/design/frontend/base/default/template/phoenix/bankpayment/*", "app/design/frontend/base/default/template/phoenix/bankpayment/"],
       ["app/locale/da_DK/Phoenix_BankPayment.csv", "app/locale/da_DK/Phoenix_BankPayment.csv"],
       ["app/locale/de_DE/Phoenix_BankPayment.csv", "app/locale/de_DE/Phoenix_BankPayment.csv"],
       ["app/locale/el_GR/Phoenix_BankPayment.csv", "app/locale/el_GR/Phoenix_BankPayment.csv"],

diff --git a/modman b/modman
@@ -1,6 +1,6 @@
 app/code/community/Phoenix/BankPayment app/code/community/Phoenix/BankPayment
-app/design/adminhtml/default/default/template/bankpayment app/design/adminhtml/default/default/template/bankpayment
-app/design/frontend/base/default/template/bankpayment app/design/frontend/base/default/template/bankpayment
+app/design/adminhtml/default/default/template/phoenix/bankpayment app/design/adminhtml/default/default/template/phoenix/bankpayment
+app/design/frontend/base/default/template/phoenix/bankpayment app/design/frontend/base/default/template/phoenix/bankpayment
 app/etc/modules/Phoenix_BankPayment.xml app/etc/modules/Phoenix_BankPayment.xml
 app/locale/da_DK/Phoenix_BankPayment.csv app/locale/da_DK/Phoenix_BankPayment.csv
 app/locale/de_DE/Phoenix_BankPayment.csv app/locale/de_DE/Phoenix_BankPayment.csv