From b57fba5ccdc32a9b03657b1050a202a9a9db0075 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Sat, 13 Dec 2014 13:32:55 +0100
Subject: [PATCH] Rearrange files to have the directory structure of the final
package
---
.../code/community/OpenTools/Ordernumber}/Helper/Data.php | 0
.../code/community/OpenTools/Ordernumber}/Model/Observer.php | 4 ++--
.../community/OpenTools/Ordernumber}/Model/Ordernumber.php | 0
.../OpenTools/Ordernumber}/Model/Resource/Ordernumber.php | 0
.../Ordernumber}/Model/Resource/Ordernumber/Collection.php | 0
.../code/community/OpenTools/Ordernumber}/etc/config.xml | 2 ++
.../code/community/OpenTools/Ordernumber}/etc/system.xml | 0
.../sql/opentools_ordernumber_setup/install-0.1.0.php | 0
.../etc/modules/OpenTools_Ordernumber.xml | 0
9 files changed, 4 insertions(+), 2 deletions(-)
rename {Ordernumber => app/code/community/OpenTools/Ordernumber}/Helper/Data.php (100%)
rename {Ordernumber => app/code/community/OpenTools/Ordernumber}/Model/Observer.php (98%)
rename {Ordernumber => app/code/community/OpenTools/Ordernumber}/Model/Ordernumber.php (100%)
rename {Ordernumber => app/code/community/OpenTools/Ordernumber}/Model/Resource/Ordernumber.php (100%)
rename {Ordernumber => app/code/community/OpenTools/Ordernumber}/Model/Resource/Ordernumber/Collection.php (100%)
rename {Ordernumber => app/code/community/OpenTools/Ordernumber}/etc/config.xml (99%)
rename {Ordernumber => app/code/community/OpenTools/Ordernumber}/etc/system.xml (100%)
rename {Ordernumber => app/code/community/OpenTools/Ordernumber}/sql/opentools_ordernumber_setup/install-0.1.0.php (100%)
rename OpenTools_Ordernumber.xml => app/etc/modules/OpenTools_Ordernumber.xml (100%)
diff --git a/Ordernumber/Helper/Data.php b/app/code/community/OpenTools/Ordernumber/Helper/Data.php
similarity index 100%
rename from Ordernumber/Helper/Data.php
rename to app/code/community/OpenTools/Ordernumber/Helper/Data.php
diff --git a/Ordernumber/Model/Observer.php b/app/code/community/OpenTools/Ordernumber/Model/Observer.php
similarity index 98%
rename from Ordernumber/Model/Observer.php
rename to app/code/community/OpenTools/Ordernumber/Model/Observer.php
index 243853f..64377d3 100644
--- a/Ordernumber/Model/Observer.php
+++ b/app/code/community/OpenTools/Ordernumber/Model/Observer.php
@@ -80,7 +80,7 @@ class OpenTools_Ordernumber_Model_Observer extends Mage_Core_Model_Abstract
$digits = Mage::getStoreConfig($cfgprefix.'/digits', $storeId);
// First, replace all variables:
- $helper = Mage::helper('ordernumber');
+ $helper = Mage::helper('opentools/ordernumber');
$info = array('order'=>$order, $nrtype=>$object);
$nr = $helper->replace_fields ($format, $nrtype, $info);
@@ -102,7 +102,7 @@ class OpenTools_Ordernumber_Model_Observer extends Mage_Core_Model_Abstract
// Find the next counter value
$count = $model->getCounterValueIncremented($nrtype, $counterfmt);
- $newnumber = str_replace ("#", sprintf('%0' . (int)$padding . 's', $count), $format);
+ $newnumber = str_replace ("#", sprintf('%0' . (int)$digits . 's', $count), $format);
// Check whether that number is already in use. If so, attempt to create the next number:
$modelname=($nrtype=='order') ? 'sales/order' : ('sales/order_'.$nrtype);
diff --git a/Ordernumber/Model/Ordernumber.php b/app/code/community/OpenTools/Ordernumber/Model/Ordernumber.php
similarity index 100%
rename from Ordernumber/Model/Ordernumber.php
rename to app/code/community/OpenTools/Ordernumber/Model/Ordernumber.php
diff --git a/Ordernumber/Model/Resource/Ordernumber.php b/app/code/community/OpenTools/Ordernumber/Model/Resource/Ordernumber.php
similarity index 100%
rename from Ordernumber/Model/Resource/Ordernumber.php
rename to app/code/community/OpenTools/Ordernumber/Model/Resource/Ordernumber.php
diff --git a/Ordernumber/Model/Resource/Ordernumber/Collection.php b/app/code/community/OpenTools/Ordernumber/Model/Resource/Ordernumber/Collection.php
similarity index 100%
rename from Ordernumber/Model/Resource/Ordernumber/Collection.php
rename to app/code/community/OpenTools/Ordernumber/Model/Resource/Ordernumber/Collection.php
diff --git a/Ordernumber/etc/config.xml b/app/code/community/OpenTools/Ordernumber/etc/config.xml
similarity index 99%
rename from Ordernumber/etc/config.xml
rename to app/code/community/OpenTools/Ordernumber/etc/config.xml
index 2030f4a..9af89a0 100644
--- a/Ordernumber/etc/config.xml
+++ b/app/code/community/OpenTools/Ordernumber/etc/config.xml
@@ -49,6 +49,7 @@
</connection>
</opentools_ordernumber_read>
</resources>
+
<events>
<sales_model_service_quote_submit_before>
<observers>
@@ -97,6 +98,7 @@
</sales_order_creditmemo_save_before>
</events>
</global>
+
<adminhtml>
<acl>
<resources>
diff --git a/Ordernumber/etc/system.xml b/app/code/community/OpenTools/Ordernumber/etc/system.xml
similarity index 100%
rename from Ordernumber/etc/system.xml
rename to app/code/community/OpenTools/Ordernumber/etc/system.xml
diff --git a/Ordernumber/sql/opentools_ordernumber_setup/install-0.1.0.php b/app/code/community/OpenTools/Ordernumber/sql/opentools_ordernumber_setup/install-0.1.0.php
similarity index 100%
rename from Ordernumber/sql/opentools_ordernumber_setup/install-0.1.0.php
rename to app/code/community/OpenTools/Ordernumber/sql/opentools_ordernumber_setup/install-0.1.0.php
diff --git a/OpenTools_Ordernumber.xml b/app/etc/modules/OpenTools_Ordernumber.xml
similarity index 100%
rename from OpenTools_Ordernumber.xml
rename to app/etc/modules/OpenTools_Ordernumber.xml
--
GitLab