DHL_Allyouneed - Version 2.4.0

Version Notes

--

Download this release

Release Info

Developer DHL Vertriebs GmbH
Extension DHL_Allyouneed
Version 2.4.0
Comparing to
See all releases


Code changes from version 2.2.2 to 2.4.0

Files changed (31) hide show
  1. app/code/community/Dhl/MeinPaket/Block/Adminhtml/ProductExport/Export.php +1 -1
  2. app/code/community/Dhl/MeinPaket/Helper/Product.php +1 -1
  3. app/code/community/Dhl/MeinPaket/Model/Observer.php +4 -5
  4. app/code/community/Dhl/MeinPaket/Model/Service/Product/Export.php +3 -2
  5. app/code/community/Dhl/MeinPaket/Model/Service/ProductData/RequestService.php +1 -1
  6. app/code/community/Dhl/MeinPaket/controllers/Adminhtml/Backlog/ProductController.php +8 -0
  7. app/code/community/Dhl/MeinPaket/controllers/Adminhtml/BestPriceController.php +8 -0
  8. app/code/community/Dhl/MeinPaket/controllers/Adminhtml/CategoryImportController.php +8 -0
  9. app/code/community/Dhl/MeinPaket/controllers/Adminhtml/MatchingController.php +9 -0
  10. app/code/community/Dhl/MeinPaket/controllers/Adminhtml/ProductExportController.php +14 -5
  11. app/code/community/Dhl/MeinPaket/etc/adminhtml.xml +31 -6
  12. app/code/community/Dhl/MeinPaket/etc/config.xml +1 -1
  13. app/code/community/Dhl/MeinPaketCommon/Block/Adminhtml/Log/Grid.php +5 -0
  14. app/code/community/Dhl/MeinPaketCommon/Helper/Data.php +17 -17
  15. app/code/community/Dhl/MeinPaketCommon/Helper/Product.php +43 -9
  16. app/code/community/Dhl/MeinPaketCommon/Model/Client/XmlOverHttp.php +1 -0
  17. app/code/community/Dhl/MeinPaketCommon/Model/Service/Order/ImportService.php +73 -27
  18. app/code/community/Dhl/MeinPaketCommon/Model/Xml/Request/DataRequest.php +1 -1
  19. app/code/community/Dhl/MeinPaketCommon/Model/Xml/Request/UploadRequest.php +65 -23
  20. app/code/community/Dhl/MeinPaketCommon/Model/Xml/Response/UploadResponse.php +3 -3
  21. app/code/community/Dhl/MeinPaketCommon/controllers/Adminhtml/AsyncController.php +8 -0
  22. app/code/community/Dhl/MeinPaketCommon/controllers/Adminhtml/LogController.php +8 -0
  23. app/code/community/Dhl/MeinPaketCommon/controllers/Adminhtml/OrderImportController.php +8 -0
  24. app/code/community/Dhl/MeinPaketCommon/etc/adminhtml.xml +21 -4
  25. app/code/community/Dhl/MeinPaketCommon/etc/config.xml +5 -2
  26. app/code/community/Dhl/MeinPaketCommon/etc/system.xml +12 -2
  27. app/code/community/Dhl/MeinPaketCommon/sql/meinpaketcommon_setup/mysql4-upgrade-1.1.1-1.2.0.php +11 -0
  28. app/code/community/Dhl/Postpay/etc/config.xml +1 -1
  29. app/design/adminhtml/default/default/template/meinpaket/catalog/product/matching/tab.phtml +3 -1
  30. package.xml +4 -4
  31. skin/frontend/default/default/meinpaket/images/dhl_checkout_button.png +0 -0
app/code/community/Dhl/MeinPaket/Block/Adminhtml/ProductExport/Export.php CHANGED
@@ -67,6 +67,6 @@ class Dhl_MeinPaket_Block_Adminhtml_ProductExport_Export extends Mage_Adminhtml_
67
  * @return string
68
  */
69
  protected function getErrorDescription($errorType, $errorCode = '') {
70
- return Mage::helper ( 'meinpaket/product' )->getErrorDescription ( $errorType, $errorCode );
71
  }
72
  }
67
  * @return string
68
  */
69
  protected function getErrorDescription($errorType, $errorCode = '') {
70
+ return Mage::helper ( 'meinpaketcommon/product' )->getErrorDescription ( $errorType, $errorCode );
71
  }
72
  }
app/code/community/Dhl/MeinPaket/Helper/Product.php CHANGED
@@ -272,7 +272,7 @@ class Dhl_MeinPaket_Helper_Product extends Mage_Core_Helper_Abstract {
272
  if ($simpleProduct->getTypeId () === Mage_Catalog_Model_Product_Type::TYPE_SIMPLE) {
273
  $parentIds = Mage::getModel ( 'catalog/product_type_configurable' )->getParentIdsByChild ( $simpleProduct->getId () );
274
  if (isset ( $parentIds [0] )) {
275
- $parentConfigurable = Mage::getModel ( 'catalog/product' )->load ( $parentIds [0] );
276
  }
277
  }
278
 
272
  if ($simpleProduct->getTypeId () === Mage_Catalog_Model_Product_Type::TYPE_SIMPLE) {
273
  $parentIds = Mage::getModel ( 'catalog/product_type_configurable' )->getParentIdsByChild ( $simpleProduct->getId () );
274
  if (isset ( $parentIds [0] )) {
275
+ $parentConfigurable = Mage::getModel ( 'catalog/product' )->setStoreId(Mage::helper ( 'meinpaketcommon/data' )->getMeinPaketStoreId ())->load ( $parentIds [0] );
276
  }
277
  }
278
 
app/code/community/Dhl/MeinPaket/Model/Observer.php CHANGED
@@ -34,7 +34,7 @@ class Dhl_MeinPaket_Model_Observer {
34
  */
35
  public function catalogProductDeleteBefore(Varien_Event_Observer $observer) {
36
  try {
37
- $product = Mage::getModel ( 'catalog/product' )->load ( $observer->getData ( 'product' )->getId () );
38
  if ($product->hasData ( 'was_exported_for_dhl_mein_paket' ) && (( boolean ) $product->getData ( 'product_was_exported_for_dhl' )) === true) {
39
  $product->setStatus ( Mage_Catalog_Model_Product_Status::STATUS_DISABLED )->save ();
40
  }
@@ -142,14 +142,13 @@ class Dhl_MeinPaket_Model_Observer {
142
  }
143
  return $this;
144
  }
145
-
146
  public function catalogInventoryStockItemSaveAfter() {
147
- //TODO:
148
  }
149
 
150
  /**
151
- *
152
- * @param unknown $observer
153
  */
154
  public function addMeinPaketAttributes($observer) {
155
  $fieldset = $observer->getForm ()->getElement ( 'base_fieldset' );
34
  */
35
  public function catalogProductDeleteBefore(Varien_Event_Observer $observer) {
36
  try {
37
+ $product = Mage::getModel ( 'catalog/product' )->setStoreId ( Mage::helper ( 'meinpaketcommon/data' )->getMeinPaketStoreId () )->load ( $observer->getData ( 'product' )->getId () );
38
  if ($product->hasData ( 'was_exported_for_dhl_mein_paket' ) && (( boolean ) $product->getData ( 'product_was_exported_for_dhl' )) === true) {
39
  $product->setStatus ( Mage_Catalog_Model_Product_Status::STATUS_DISABLED )->save ();
40
  }
142
  }
143
  return $this;
144
  }
 
145
  public function catalogInventoryStockItemSaveAfter() {
146
+ // TODO:
147
  }
148
 
149
  /**
150
+ *
151
+ * @param unknown $observer
152
  */
153
  public function addMeinPaketAttributes($observer) {
154
  $fieldset = $observer->getForm ()->getElement ( 'base_fieldset' );
app/code/community/Dhl/MeinPaket/Model/Service/Product/Export.php CHANGED
@@ -21,7 +21,7 @@ class Dhl_MeinPaket_Model_Service_Product_Export extends Dhl_MeinPaketCommon_Mod
21
  */
22
  public function __construct() {
23
  $this->_processableProducts = array ();
24
- $this->_productHelper = Mage::helper ( 'meinpaket/product' );
25
  }
26
 
27
  /**
@@ -69,7 +69,8 @@ class Dhl_MeinPaket_Model_Service_Product_Export extends Dhl_MeinPaketCommon_Mod
69
  $seenMagentoProducts [$productId] = true;
70
 
71
  /* @var $product Mage_Catalog_Model_Product */
72
- $product = Mage::getModel ( 'catalog/product' )->load ( $productId );
 
73
 
74
  $syncMode = $product->getData ( 'sync_with_dhl_mein_paket' );
75
 
21
  */
22
  public function __construct() {
23
  $this->_processableProducts = array ();
24
+ $this->_productHelper = Mage::helper ( 'meinpaketcommon/product' );
25
  }
26
 
27
  /**
69
  $seenMagentoProducts [$productId] = true;
70
 
71
  /* @var $product Mage_Catalog_Model_Product */
72
+ $product = Mage::getModel ( 'catalog/product' )->setStoreId(
73
+ Mage::helper('meinpaketcommon/data')->getMeinPaketStoreId())->load ( $productId );
74
 
75
  $syncMode = $product->getData ( 'sync_with_dhl_mein_paket' );
76
 
app/code/community/Dhl/MeinPaket/Model/Service/ProductData/RequestService.php CHANGED
@@ -57,7 +57,7 @@ class Dhl_MeinPaket_Model_Service_ProductData_RequestService {
57
 
58
  try {
59
  /* @var $collection Mage_Catalog_Model_Resource_Product_Collection */
60
- $collection = Mage::getModel ( 'catalog/product' )->getCollection ();
61
 
62
  $collection->addAttributeToFilter ( 'meinpaket_id', array (
63
  'neq' => ''
57
 
58
  try {
59
  /* @var $collection Mage_Catalog_Model_Resource_Product_Collection */
60
+ $collection = Mage::getModel ( 'catalog/product' )->getCollection ()->addStoreFilter ( Mage::helper ( 'meinpaketcommon/data' )->getMeinPaketStoreId () );
61
 
62
  $collection->addAttributeToFilter ( 'meinpaket_id', array (
63
  'neq' => ''
app/code/community/Dhl/MeinPaket/controllers/Adminhtml/Backlog/ProductController.php CHANGED
@@ -4,6 +4,14 @@ class Dhl_MeinPaket_Adminhtml_Backlog_ProductController extends Mage_Adminhtml_C
4
  $this->loadLayout ()->_setActiveMenu ( 'meinpaket/backlog' )->_addBreadcrumb ( Mage::helper ( 'meinpaket' )->__ ( 'Backlog' ), Mage::helper ( 'meinpaket' )->__ ( 'Backlog' ) );
5
  return $this;
6
  }
 
 
 
 
 
 
 
 
7
  public function indexAction() {
8
  $this->_initAction ()->renderLayout ();
9
  }
4
  $this->loadLayout ()->_setActiveMenu ( 'meinpaket/backlog' )->_addBreadcrumb ( Mage::helper ( 'meinpaket' )->__ ( 'Backlog' ), Mage::helper ( 'meinpaket' )->__ ( 'Backlog' ) );
5
  return $this;
6
  }
7
+ /**
8
+ * (non-PHPdoc)
9
+ *
10
+ * @see Mage_Adminhtml_Controller_Action::_isAllowed()
11
+ */
12
+ protected function _isAllowed() {
13
+ return Mage::getSingleton ( 'admin/session' )->isAllowed ( 'admin/meinpaket/backlog' );
14
+ }
15
  public function indexAction() {
16
  $this->_initAction ()->renderLayout ();
17
  }
app/code/community/Dhl/MeinPaket/controllers/Adminhtml/BestPriceController.php CHANGED
@@ -8,6 +8,14 @@ class Dhl_MeinPaket_Adminhtml_BestPriceController extends Mage_Adminhtml_Control
8
  $this->loadLayout ()->_setActiveMenu ( 'meinpaket/bestprice' )->_addBreadcrumb ( Mage::helper ( 'meinpaket' )->__ ( 'Best Price' ), Mage::helper ( 'meinpaket' )->__ ( 'Best Price' ) );
9
  return $this;
10
  }
 
 
 
 
 
 
 
 
11
  public function indexAction() {
12
  $this->_initAction ()->renderLayout ();
13
  }
8
  $this->loadLayout ()->_setActiveMenu ( 'meinpaket/bestprice' )->_addBreadcrumb ( Mage::helper ( 'meinpaket' )->__ ( 'Best Price' ), Mage::helper ( 'meinpaket' )->__ ( 'Best Price' ) );
9
  return $this;
10
  }
11
+ /**
12
+ * (non-PHPdoc)
13
+ *
14
+ * @see Mage_Adminhtml_Controller_Action::_isAllowed()
15
+ */
16
+ protected function _isAllowed() {
17
+ return Mage::getSingleton ( 'admin/session' )->isAllowed ( 'admin/meinpaket/bestprice' );
18
+ }
19
  public function indexAction() {
20
  $this->_initAction ()->renderLayout ();
21
  }
app/code/community/Dhl/MeinPaket/controllers/Adminhtml/CategoryImportController.php CHANGED
@@ -19,6 +19,14 @@ class Dhl_MeinPaket_Adminhtml_CategoryImportController extends Mage_Adminhtml_Co
19
  $this->_title ( $this->__ ( 'Allyouneed' ) )->_title ( $this->__ ( 'Category Import' ) );
20
  return $this;
21
  }
 
 
 
 
 
 
 
 
22
 
23
  /**
24
  * Default action.
19
  $this->_title ( $this->__ ( 'Allyouneed' ) )->_title ( $this->__ ( 'Category Import' ) );
20
  return $this;
21
  }
22
+ /**
23
+ * (non-PHPdoc)
24
+ *
25
+ * @see Mage_Adminhtml_Controller_Action::_isAllowed()
26
+ */
27
+ protected function _isAllowed() {
28
+ return Mage::getSingleton ( 'admin/session' )->isAllowed ( 'admin/meinpaket/category_import' );
29
+ }
30
 
31
  /**
32
  * Default action.
app/code/community/Dhl/MeinPaket/controllers/Adminhtml/MatchingController.php CHANGED
@@ -4,6 +4,15 @@
4
  *
5
  */
6
  class Dhl_MeinPaket_Adminhtml_MatchingController extends Mage_Adminhtml_Controller_Action {
 
 
 
 
 
 
 
 
 
7
  /**
8
  * Get custom products grid and serializer block
9
  */
4
  *
5
  */
6
  class Dhl_MeinPaket_Adminhtml_MatchingController extends Mage_Adminhtml_Controller_Action {
7
+ /**
8
+ * (non-PHPdoc)
9
+ *
10
+ * @see Mage_Adminhtml_Controller_Action::_isAllowed()
11
+ */
12
+ protected function _isAllowed() {
13
+ return Mage::getSingleton ( 'admin/session' )->isAllowed ( 'admin/meinpaket/matching' );
14
+ }
15
+
16
  /**
17
  * Get custom products grid and serializer block
18
  */
app/code/community/Dhl/MeinPaket/controllers/Adminhtml/ProductExportController.php CHANGED
@@ -40,6 +40,15 @@ class Dhl_MeinPaket_Adminhtml_ProductExportController extends Mage_Adminhtml_Con
40
  return $this;
41
  }
42
 
 
 
 
 
 
 
 
 
 
43
  /**
44
  * Default action.
45
  *
@@ -75,7 +84,7 @@ class Dhl_MeinPaket_Adminhtml_ProductExportController extends Mage_Adminhtml_Con
75
  $results = null;
76
 
77
  try {
78
- $results = $exportService->exportProducts ( );
79
 
80
  if ($debugMode) {
81
  Mage::getSingleton ( 'adminhtml/session' )->addSuccess ( 'DEBUG:' . $results->debugOutput () );
@@ -105,10 +114,10 @@ class Dhl_MeinPaket_Adminhtml_ProductExportController extends Mage_Adminhtml_Con
105
  $this->_initAction ();
106
  $block = $this->getLayout ()->getBlock ( 'meinpaket.adminhtml_productExport_export' );
107
  /*
108
- if ($results !== null) {
109
- $block->setResults ( $results );
110
- }
111
- */
112
  $this->renderLayout ();
113
  }
114
 
40
  return $this;
41
  }
42
 
43
+ /**
44
+ * (non-PHPdoc)
45
+ *
46
+ * @see Mage_Adminhtml_Controller_Action::_isAllowed()
47
+ */
48
+ protected function _isAllowed() {
49
+ return Mage::getSingleton ( 'admin/session' )->isAllowed ( 'admin/meinpaket/product_export' );
50
+ }
51
+
52
  /**
53
  * Default action.
54
  *
84
  $results = null;
85
 
86
  try {
87
+ $results = $exportService->exportProducts ();
88
 
89
  if ($debugMode) {
90
  Mage::getSingleton ( 'adminhtml/session' )->addSuccess ( 'DEBUG:' . $results->debugOutput () );
114
  $this->_initAction ();
115
  $block = $this->getLayout ()->getBlock ( 'meinpaket.adminhtml_productExport_export' );
116
  /*
117
+ * if ($results !== null) {
118
+ * $block->setResults ( $results );
119
+ * }
120
+ */
121
  $this->renderLayout ();
122
  }
123
 
app/code/community/Dhl/MeinPaket/etc/adminhtml.xml CHANGED
@@ -4,27 +4,27 @@
4
  <meinpaket>
5
  <title>Allyouneed / Postpay</title>
6
  <children>
7
- <meinpaket_backlog translate="title" module="meinpaket">
8
  <title>Synchronisation</title>
9
  <action>meinpaket/adminhtml_backlog_product</action>
10
  <depends>
11
  <config>meinpaket/credentials/active</config>
12
  </depends>
13
- </meinpaket_backlog>
14
- <meinpaket_categoryimport translate="title" module="meinpaket">
15
  <title>import categories</title>
16
  <action>meinpaket/adminhtml_categoryImport</action>
17
  <depends>
18
  <config>meinpaket/credentials/active</config>
19
  </depends>
20
- </meinpaket_categoryimport>
21
- <meinpaket_bestprice translate="title" module="meinpaket">
22
  <title>best prices</title>
23
  <action>meinpaket/adminhtml_bestPrice</action>
24
  <depends>
25
  <config>meinpaket/credentials/active</config>
26
  </depends>
27
- </meinpaket_bestprice>
28
  </children>
29
  <sort_order>90</sort_order>
30
  <class>meinpaket</class>
@@ -34,6 +34,31 @@
34
  <resources>
35
  <admin>
36
  <children>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
37
  <system>
38
  <children>
39
  <config>
4
  <meinpaket>
5
  <title>Allyouneed / Postpay</title>
6
  <children>
7
+ <backlog translate="title" module="meinpaket">
8
  <title>Synchronisation</title>
9
  <action>meinpaket/adminhtml_backlog_product</action>
10
  <depends>
11
  <config>meinpaket/credentials/active</config>
12
  </depends>
13
+ </backlog>
14
+ <category_import translate="title" module="meinpaket">
15
  <title>import categories</title>
16
  <action>meinpaket/adminhtml_categoryImport</action>
17
  <depends>
18
  <config>meinpaket/credentials/active</config>
19
  </depends>
20
+ </category_import>
21
+ <bestprice translate="title" module="meinpaket">
22
  <title>best prices</title>
23
  <action>meinpaket/adminhtml_bestPrice</action>
24
  <depends>
25
  <config>meinpaket/credentials/active</config>
26
  </depends>
27
+ </bestprice>
28
  </children>
29
  <sort_order>90</sort_order>
30
  <class>meinpaket</class>
34
  <resources>
35
  <admin>
36
  <children>
37
+ <meinpaket translate="title">
38
+ <title>Allyouneed</title>
39
+ <children>
40
+ <backlog translate="title">
41
+ <title>Backlog</title>
42
+ <sort_order>50</sort_order>
43
+ </backlog>
44
+ <bestprice translate="title">
45
+ <title>Bestprice</title>
46
+ <sort_order>51</sort_order>
47
+ </bestprice>
48
+ <category_import translate="title">
49
+ <title>Category Import</title>
50
+ <sort_order>52</sort_order>
51
+ </category_import>
52
+ <matching translate="title">
53
+ <title>Matching</title>
54
+ <sort_order>53</sort_order>
55
+ </matching>
56
+ <product_export translate="title">
57
+ <title>Product Export</title>
58
+ <sort_order>54</sort_order>
59
+ </product_export>
60
+ </children>
61
+ </meinpaket>
62
  <system>
63
  <children>
64
  <config>
app/code/community/Dhl/MeinPaket/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Dhl_MeinPaket>
5
- <version>2.2.0</version>
6
  </Dhl_MeinPaket>
7
  </modules>
8
  <admin>
2
  <config>
3
  <modules>
4
  <Dhl_MeinPaket>
5
+ <version>2.4.0</version>
6
  </Dhl_MeinPaket>
7
  </modules>
8
  <admin>
app/code/community/Dhl/MeinPaketCommon/Block/Adminhtml/Log/Grid.php CHANGED
@@ -24,6 +24,11 @@ class Dhl_MeinPaketCommon_Block_Adminhtml_Log_Grid extends Mage_Adminhtml_Block_
24
  'header' => Mage::helper ( 'meinpaketcommon' )->__ ( 'Request ID' ),
25
  'index' => 'request_id'
26
  ) );
 
 
 
 
 
27
 
28
  $this->addColumn ( 'send', array (
29
  'header' => Mage::helper ( 'meinpaketcommon' )->__ ( 'Send' ),
24
  'header' => Mage::helper ( 'meinpaketcommon' )->__ ( 'Request ID' ),
25
  'index' => 'request_id'
26
  ) );
27
+
28
+ $this->addColumn ( 'url', array (
29
+ 'header' => Mage::helper ( 'meinpaketcommon' )->__ ( 'URL' ),
30
+ 'index' => 'url'
31
+ ) );
32
 
33
  $this->addColumn ( 'send', array (
34
  'header' => Mage::helper ( 'meinpaketcommon' )->__ ( 'Send' ),
app/code/community/Dhl/MeinPaketCommon/Helper/Data.php CHANGED
@@ -52,27 +52,27 @@ class Dhl_MeinPaketCommon_Helper_Data extends Mage_Core_Helper_Abstract {
52
  }
53
 
54
  /**
55
- * Get filtered quote from session.
56
  *
57
  * @return boolean
58
  */
59
- public function checkItem(Mage_Sales_Model_Order_Item $item) {
60
- $options = Mage::helper ( 'catalog/product_configuration' )->getCustomOptions ( $item );
61
- // $options = $item->getProduct ()->getTypeInstance ( true )->getOrderOptions ( $item->getProduct () );
62
-
63
- if (count ( $options ) || $item->getIsNominal () || $item->getIsVirtual () || $item->getIsRecurring ()) {
64
- return false;
65
- }
66
- // Mage::log ( Zend_Debug::dump ( $options ) );
67
-
68
- if ($item->getParentItemId ()) {
69
- true;
70
- }
71
-
72
- if ($item->getProduct ()->isVirtual () || $item->getProduct ()->isRecurring ()) {
73
- return false;
74
  }
75
 
76
- return true;
77
  }
78
  }
52
  }
53
 
54
  /**
55
+ * Check for usable items.
56
  *
57
  * @return boolean
58
  */
59
+ public function checkItem(Mage_Core_Model_Abstract $item) {
60
+ return (! ($item instanceof Mage_Catalog_Model_Product_Configuration_Item_Interface) || count ( Mage::helper ( 'catalog/product_configuration' )->getCustomOptions ( $item ) ) <= 0) && ! $item->getIsNominal () && ! $item->getIsVirtual () && ! $item->getIsRecurring ();
61
+ }
62
+
63
+ /**
64
+ * Calculate price without tax
65
+ *
66
+ * @param float $price
67
+ * with tax
68
+ * @param float $tax
69
+ * tax amount. If $tax > 1 $tax is assumed to be in percent.
70
+ */
71
+ public function priceWithoutTax($price, $tax) {
72
+ if ($tax > 1) {
73
+ $tax = $tax / 100;
74
  }
75
 
76
+ return $price / (1 + $tax);
77
  }
78
  }
app/code/community/Dhl/MeinPaketCommon/Helper/Product.php CHANGED
@@ -30,7 +30,18 @@ class Dhl_MeinPaketCommon_Helper_Product extends Mage_Core_Helper_Abstract {
30
  * @return void
31
  */
32
  public function __construct() {
33
- $this->_eanValidator = Mage::getSingleton ( 'meinpaket/validation_validatorFactory' )->createEanValidator ();
 
 
 
 
 
 
 
 
 
 
 
34
  }
35
 
36
  /**
@@ -73,7 +84,7 @@ class Dhl_MeinPaketCommon_Helper_Product extends Mage_Core_Helper_Abstract {
73
  */
74
  public function getImages(Mage_Catalog_Model_Product $product) {
75
  $images = array ();
76
- $galleryImages = Mage::getModel ( 'catalog/product' )->load ( $product->getId () )->getMediaGalleryImages ();
77
  $imageUrl = '';
78
  $imageCaption = '';
79
 
@@ -149,6 +160,29 @@ class Dhl_MeinPaketCommon_Helper_Product extends Mage_Core_Helper_Abstract {
149
  return $taxHelper->getPrice ( $product, $product->getPrice (), $priceIncludesTax );
150
  }
151
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
152
  /**
153
  * Returns the stock count of the product which can be used for MeinPaket.
154
  *
@@ -239,7 +273,7 @@ class Dhl_MeinPaketCommon_Helper_Product extends Mage_Core_Helper_Abstract {
239
  if ($simpleProduct->getTypeId () === Mage_Catalog_Model_Product_Type::TYPE_SIMPLE) {
240
  $parentIds = Mage::getModel ( 'catalog/product_type_configurable' )->getParentIdsByChild ( $simpleProduct->getId () );
241
  if (isset ( $parentIds [0] )) {
242
- $parentConfigurable = Mage::getModel ( 'catalog/product' )->load ( $parentIds [0] );
243
  }
244
  }
245
 
@@ -264,16 +298,16 @@ class Dhl_MeinPaketCommon_Helper_Product extends Mage_Core_Helper_Abstract {
264
  $description = $this->__ ( 'Missing value for field' ) . ' "<i><b>' . $this->__ ( $this->getLabelForFieldName ( $errorCode ) ) . '</b></i>".';
265
  break;
266
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_PRODUCT_NOT_EXISTS_IN_MEINPAKET :
267
- $description = $this->__ ( 'Product is unknown in MeinPaket marketplace' ) . '.';
268
  break;
269
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_PRODUCT_NEGATIVE_STOCK :
270
  $description = $this->__ ( 'Product stock is lower than zero.' );
271
  break;
272
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_MEINPAKET_SERVER_ERROR :
273
- $description = $this->__ ( 'Internal error on MeinPaket server' ) . '.';
274
  break;
275
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_NOT_AUTHORIZED :
276
- $description = $this->__ ( 'You are not authorized to execute the requested functionality on MeinPaket' );
277
  break;
278
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_INVALID_DATA :
279
  $description = $this->__ ( 'The provided data was incorrect' );
@@ -288,16 +322,16 @@ class Dhl_MeinPaketCommon_Helper_Product extends Mage_Core_Helper_Abstract {
288
  $description = $this->__ ( 'The referenced product cannot be sold' );
289
  break;
290
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_MARKETPLACE_CATEGORY_NOT_FOUND :
291
- $description = $this->__ ( 'The referenced marketplace category could not be found at MeinPaket' );
292
  break;
293
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_SHOP_CATEGORY_NOT_FOUND :
294
- $description = $this->__ ( 'The referenced shop category could not be found at MeinPaket' );
295
  break;
296
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_MISSING_VALUE_FOR_ATTRIBUTE :
297
  $description = $this->__ ( 'Missing value mapping for attribute' ) . ' "' . $errorCode . '".';
298
  break;
299
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_VARIANT_GROUP_NOT_EXISTS :
300
- $description = $this->__ ( 'Variant group does not exist on MeinPaket' ) . ' "' . $errorCode . '".';
301
  break;
302
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_UNDEFINED :
303
  default :
30
  * @return void
31
  */
32
  public function __construct() {
33
+ $this->_eanValidator = Mage::getSingleton ( 'meinpaketcommon/validation_validator_ean' );
34
+ }
35
+
36
+ /**
37
+ * Return true if the product should be listed.
38
+ *
39
+ * @param Mage_Catalog_Model_Product $product
40
+ * to be checked
41
+ * @return boolean true if the product should be listed
42
+ */
43
+ public function isActive(Mage_Catalog_Model_Product $product) {
44
+ return $product->getData ( 'sync_with_dhl_mein_paket' ) > 0;
45
  }
46
 
47
  /**
84
  */
85
  public function getImages(Mage_Catalog_Model_Product $product) {
86
  $images = array ();
87
+ $galleryImages = Mage::getModel ( 'catalog/product' )->setStoreId ( Mage::helper ( 'meinpaketcommon/data' )->getMeinPaketStoreId () )->load ( $product->getId () )->getMediaGalleryImages ();
88
  $imageUrl = '';
89
  $imageCaption = '';
90
 
160
  return $taxHelper->getPrice ( $product, $product->getPrice (), $priceIncludesTax );
161
  }
162
 
163
+ /**
164
+ * Returns the MeinPaket tax group of the product.
165
+ *
166
+ * @param Mage_Catalog_Model_Product $product
167
+ * @return string May be "Free", "Reduced" or "Standard".
168
+ */
169
+ public function getMeinPaketTaxGroup(Mage_Catalog_Model_Product $product) {
170
+ $taxGroup = self::TAX_CLASS_STANDARD;
171
+
172
+ if ($product->hasData ( 'tax_class_id' )) {
173
+ $taxGroups = array (
174
+ '0' => self::TAX_CLASS_FREE,
175
+ Mage::getStoreConfig ( 'meinpaket/taxrates/default_tax_rate' ) => self::TAX_CLASS_STANDARD,
176
+ Mage::getStoreConfig ( 'meinpaket/taxrates/reduced_tax_rate' ) => self::TAX_CLASS_REDUCED
177
+ );
178
+ if (array_key_exists ( $product->getTaxClassId (), $taxGroups )) {
179
+ $taxGroup = $taxGroups [$product->getTaxClassId ()];
180
+ }
181
+ }
182
+
183
+ return $taxGroup;
184
+ }
185
+
186
  /**
187
  * Returns the stock count of the product which can be used for MeinPaket.
188
  *
273
  if ($simpleProduct->getTypeId () === Mage_Catalog_Model_Product_Type::TYPE_SIMPLE) {
274
  $parentIds = Mage::getModel ( 'catalog/product_type_configurable' )->getParentIdsByChild ( $simpleProduct->getId () );
275
  if (isset ( $parentIds [0] )) {
276
+ $parentConfigurable = Mage::getModel ( 'catalog/product' )->setStoreId ( Mage::helper ( 'meinpaketcommon/data' )->getMeinPaketStoreId () )->load ( $parentIds [0] );
277
  }
278
  }
279
 
298
  $description = $this->__ ( 'Missing value for field' ) . ' "<i><b>' . $this->__ ( $this->getLabelForFieldName ( $errorCode ) ) . '</b></i>".';
299
  break;
300
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_PRODUCT_NOT_EXISTS_IN_MEINPAKET :
301
+ $description = $this->__ ( 'Product is unknown in Allyouneed marketplace' ) . '.';
302
  break;
303
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_PRODUCT_NEGATIVE_STOCK :
304
  $description = $this->__ ( 'Product stock is lower than zero.' );
305
  break;
306
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_MEINPAKET_SERVER_ERROR :
307
+ $description = $this->__ ( 'Internal error on Allyouneed server' ) . '.';
308
  break;
309
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_NOT_AUTHORIZED :
310
+ $description = $this->__ ( 'You are not authorized to execute the requested functionality on Allyouneed' );
311
  break;
312
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_INVALID_DATA :
313
  $description = $this->__ ( 'The provided data was incorrect' );
322
  $description = $this->__ ( 'The referenced product cannot be sold' );
323
  break;
324
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_MARKETPLACE_CATEGORY_NOT_FOUND :
325
+ $description = $this->__ ( 'The referenced marketplace category could not be found at Allyouneed' );
326
  break;
327
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_SHOP_CATEGORY_NOT_FOUND :
328
+ $description = $this->__ ( 'The referenced shop category could not be found at Allyouneed' );
329
  break;
330
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_MISSING_VALUE_FOR_ATTRIBUTE :
331
  $description = $this->__ ( 'Missing value mapping for attribute' ) . ' "' . $errorCode . '".';
332
  break;
333
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_VARIANT_GROUP_NOT_EXISTS :
334
+ $description = $this->__ ( 'Variant group does not exist on Allyouneed' ) . ' "' . $errorCode . '".';
335
  break;
336
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_UNDEFINED :
337
  default :
app/code/community/Dhl/MeinPaketCommon/Model/Client/XmlOverHttp.php CHANGED
@@ -95,6 +95,7 @@ class Dhl_MeinPaketCommon_Model_Client_XmlOverHttp extends Varien_Object {
95
 
96
  /* @var $log Dhl_MeinPaketCommon_Model_Log */
97
  $log = Mage::getModel ( 'meinpaketcommon/log' );
 
98
  $log->setSend ( $xmlData );
99
  $log->setCreatedAt ( Varien_Date::now () );
100
  if ($xml instanceof Dhl_MeinPaketCommon_Model_Xml_Request_AsynchronousStatusRequest) {
95
 
96
  /* @var $log Dhl_MeinPaketCommon_Model_Log */
97
  $log = Mage::getModel ( 'meinpaketcommon/log' );
98
+ $log->setUrl ( $url );
99
  $log->setSend ( $xmlData );
100
  $log->setCreatedAt ( Varien_Date::now () );
101
  if ($xml instanceof Dhl_MeinPaketCommon_Model_Xml_Request_AsynchronousStatusRequest) {
app/code/community/Dhl/MeinPaketCommon/Model/Service/Order/ImportService.php CHANGED
@@ -73,7 +73,8 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
73
  */
74
  const DISABLED_ORDER_STATUS = 4;
75
  const USE_GUEST_ACCOUNT_CONFIG = 'meinpaket/order/use_guest_account';
76
- const CUSTOMER_GROUP_CONFIG = 'meinpaket/order/customer_group';
 
77
 
78
  /**
79
  *
@@ -88,6 +89,12 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
88
  */
89
  protected $_eventPrefix = 'meinpaketcommon_service_order_importService';
90
 
 
 
 
 
 
 
91
  /**
92
  * Constructor.
93
  *
@@ -105,6 +112,8 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
105
  $_outOfStockOrders = array ();
106
  $this->_disabledProductOrders = array ();
107
 
 
 
108
  parent::__construct ();
109
  }
110
 
@@ -202,8 +211,19 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
202
  * @return int
203
  */
204
  protected function _importOrder(Dhl_MeinPaketCommon_Model_Xml_Response_Partial_Order $order, $paymentMethod = self::IMPORT_PAYMENT_METHOD) {
205
- $storeId = Mage::helper ( 'meinpaketcommon/data' )->getMeinPaketStoreId ();
206
- $store = Mage::helper ( 'meinpaketcommon/data' )->getMeinPaketStore ();
 
 
 
 
 
 
 
 
 
 
 
207
 
208
  /* @var $orderObj Mage_Sales_Model_Order */
209
  $orderObj = Mage::getModel ( 'sales/order' )->load ( $order->getOrderId (), 'dhl_mein_paket_order_id' );
@@ -233,6 +253,17 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
233
  $hasNoConfigurables = true;
234
  $quoteItems = array ();
235
 
 
 
 
 
 
 
 
 
 
 
 
236
  foreach ( $order->getEntries () as $orderEntry ) {
237
  /* var $orderEntry Dhl_MeinPaketCommon_Model_Xml_Response_Partial_Order_Entry */
238
  $productId = ( string ) $orderEntry->getProductId ();
@@ -268,11 +299,22 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
268
  /* @var $item Mage_Sales_Model_Quote_Item|string */
269
 
270
  if (is_object ( $item )) {
 
 
 
 
 
 
 
 
 
 
 
 
 
271
  $item->setStoreId ( $storeId );
272
- $item->setCustomPrice ( $orderEntry->getBasePrice () );
273
- $item->setOriginalCustomPrice ( $orderEntry->getBasePrice () );
274
- $item->setOriginalPrice ( $productObj->getPrice () );
275
- $item->setBaseOriginalPrice ( $productObj->getPrice () );
276
  $item->getProduct ()->setIsSuperMode ( true );
277
  } else {
278
  Mage::log ( $item );
@@ -300,23 +342,20 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
300
  }
301
  }
302
 
303
- $rate = $this->calculateRate ( $order );
304
-
305
- $billingAddress = $quoteObj->getBillingAddress ();
306
- $billingAddress->addData ( $this->_getAddressData ( $order->getBillingAddress () ) );
307
- $shippingAddress = $quoteObj->getShippingAddress ();
308
- if ($order->getDeliveryAddress () != null) {
309
- $shippingAddress->addData ( $this->_getAddressData ( $order->getDeliveryAddress () ) );
310
  } else {
311
- $shippingAddress->addData ( $this->_getAddressData ( $order->getBillingAddress () ) );
312
  }
313
 
 
 
314
  $shippingAddress->setCollectShippingRates ( false );
315
  $shippingAddress->addShippingRate ( $rate );
316
  $shippingAddress->setShippingMethod ( $rate->getCode () );
317
 
318
- $shippingAddress->setBaseShippingAmount ( $order->getTotalDeliveryCosts () );
319
- $shippingAddress->setShippingAmount ( $order->getTotalDeliveryCosts () );
320
  $shippingAddress->setPaymentMethod ( $paymentMethod );
321
 
322
  $quoteObj->getPayment ()->importData ( array (
@@ -326,9 +365,18 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
326
  // Dhl_MeinPaketCommon_Model_Carrier_Meinpaket::unlock ();
327
  // Dhl_MeinPaketCommon_Model_Carrier_Meinpaket::setDeliveryCosts ( $order->getTotalDeliveryCosts () );
328
 
329
- $quoteObj->collectTotals ();
 
 
 
 
 
 
330
  $quoteObj->save ();
331
 
 
 
 
332
  /* @var $quoteObj Mage_Sales_Model_Service_Quote */
333
  $serviceQuote = Mage::getModel ( 'sales/service_quote', $quoteObj );
334
  $serviceQuote->submitAll ();
@@ -336,7 +384,7 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
336
  /* @var $orderModel Mage_Sales_Model_Order */
337
  $orderModel = $serviceQuote->getOrder ();
338
  /**
339
- * triggert aufruf von authorizes() auf dem payment model (ggf auch capture() )
340
  */
341
 
342
  $contactData = $order->getContactData ();
@@ -426,7 +474,7 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
426
  }
427
 
428
  // Set store and website for loadByEmail.
429
- $customer->setStore ( Mage::helper ( 'meinpaketcommon/data' )->getMeinPaketStore () );
430
  // Could not find customer by meinpaket_buyer_id. As there can only be one customer for a given
431
  // email try to load one.
432
  $customer->loadByEmail ( $order->getContactData ()->getEmail () );
@@ -437,7 +485,7 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
437
 
438
  // New customer
439
  // Set store and website again after loadByEmail reset it.
440
- $customer->setStore ( Mage::helper ( 'meinpaketcommon/data' )->getMeinPaketStore () );
441
  $customer->setFirstname ( $order->getBillingAddress ()->getFirstName () );
442
  $customer->setLastname ( $order->getBillingAddress ()->getLastName () );
443
  $customer->setEmail ( $order->getContactData ()->getEmail () );
@@ -472,15 +520,13 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
472
  * @return Mage_Sales_Model_Quote_Address_Rate
473
  */
474
  protected function calculateRate(Dhl_MeinPaketCommon_Model_Xml_Response_Partial_Order $order) {
475
- $carrier = Mage::getModel ( 'meinpaketcommon/carrier_meinpaket' );
476
- /* @var $carrier Dhl_MeinPaketCommon_Model_Carrier_Meinpaket */
477
- $methods = $carrier->getAllowedMethods ();
478
  $result = Mage::getModel ( 'sales/quote_address_rate' );
479
  /* @var $result Mage_Sales_Model_Quote_Address_Rate */
480
 
481
- $parts = explode ( "_", self::IMPORT_SHIPPING_METHOD );
482
-
483
- $result->setCarrierTitle ( 'Allyouneed' )->setCode ( self::IMPORT_SHIPPING_METHOD )->setCarrier ( $parts [0] )->setMethod ( 'standard' )->setMethodTitle ( 'Allyouneed' )->setMethodDescription ( 'Allyouneed' )->setCost ( $order->getTotalDeliveryCosts () )->setPrice ( $order->getTotalDeliveryCosts () );
484
 
485
  return $result;
486
  }
73
  */
74
  const DISABLED_ORDER_STATUS = 4;
75
  const USE_GUEST_ACCOUNT_CONFIG = 'meinpaket/order/use_guest_account';
76
+ const CUSTOMER_GROUP_CONFIG = 'meinpaket/customer/default_group';
77
+ const SHIPPING_METHOD_CONFIG = 'meinpaket/shipment/default_shipment_method';
78
 
79
  /**
80
  *
89
  */
90
  protected $_eventPrefix = 'meinpaketcommon_service_order_importService';
91
 
92
+ /**
93
+ *
94
+ * @var Dhl_MeinPaketCommon_Helper_Data
95
+ */
96
+ protected $_dataHelper;
97
+
98
  /**
99
  * Constructor.
100
  *
112
  $_outOfStockOrders = array ();
113
  $this->_disabledProductOrders = array ();
114
 
115
+ $this->_dataHelper = Mage::helper ( 'meinpaketcommon/data' );
116
+
117
  parent::__construct ();
118
  }
119
 
211
  * @return int
212
  */
213
  protected function _importOrder(Dhl_MeinPaketCommon_Model_Xml_Response_Partial_Order $order, $paymentMethod = self::IMPORT_PAYMENT_METHOD) {
214
+ $storeId = $this->_dataHelper->getMeinPaketStoreId ();
215
+ $store = $this->_dataHelper->getMeinPaketStore ();
216
+ /* @var $taxCalculation Mage_Tax_Model_Calculation */
217
+ $taxCalculation = Mage::getModel ( 'tax/calculation' );
218
+
219
+ /* @var $taxHelper Mage_Tax_Helper_Data */
220
+ // $taxHelper = Mage::helper ( 'tax' );
221
+
222
+ /* @var $taxConfig Mage_Tax_Model_Config */
223
+ $taxConfig = Mage::getSingleton ( 'tax/config' );
224
+
225
+ $priceIncludesTax = $taxConfig->priceIncludesTax ( $store );
226
+ $shippingIncludesTax = $taxConfig->shippingPriceIncludesTax ( $store );
227
 
228
  /* @var $orderObj Mage_Sales_Model_Order */
229
  $orderObj = Mage::getModel ( 'sales/order' )->load ( $order->getOrderId (), 'dhl_mein_paket_order_id' );
253
  $hasNoConfigurables = true;
254
  $quoteItems = array ();
255
 
256
+ $billingAddress = $quoteObj->getBillingAddress ();
257
+ $billingAddress->addData ( $this->_getAddressData ( $order->getBillingAddress () ) );
258
+ $shippingAddress = $quoteObj->getShippingAddress ();
259
+ if ($order->getDeliveryAddress () != null) {
260
+ $shippingAddress->addData ( $this->_getAddressData ( $order->getDeliveryAddress () ) );
261
+ } else {
262
+ $shippingAddress->addData ( $this->_getAddressData ( $order->getBillingAddress () ) );
263
+ }
264
+
265
+ $taxRequest = $taxCalculation->getRateRequest ( $shippingAddress, $billingAddress, $customer, $store );
266
+
267
  foreach ( $order->getEntries () as $orderEntry ) {
268
  /* var $orderEntry Dhl_MeinPaketCommon_Model_Xml_Response_Partial_Order_Entry */
269
  $productId = ( string ) $orderEntry->getProductId ();
299
  /* @var $item Mage_Sales_Model_Quote_Item|string */
300
 
301
  if (is_object ( $item )) {
302
+ $taxRequest->setProductClassId ( $item->getProduct ()->getTaxClassId () );
303
+ $percent = $taxCalculation->getRate ( $taxRequest );
304
+ if ($percent <= 0) {
305
+ $percent = 19;
306
+ }
307
+
308
+ if ($priceIncludesTax) {
309
+ $customPrice = $orderEntry->getBasePrice ();
310
+ } else {
311
+ $customPrice = $this->_dataHelper->priceWithoutTax ( $orderEntry->getBasePrice (), $percent );
312
+ }
313
+
314
+ /* @var $item Mage_Sales_Model_Quote_Item */
315
  $item->setStoreId ( $storeId );
316
+ $item->setCustomPrice ( $customPrice );
317
+ $item->setOriginalCustomPrice ( $customPrice );
 
 
318
  $item->getProduct ()->setIsSuperMode ( true );
319
  } else {
320
  Mage::log ( $item );
342
  }
343
  }
344
 
345
+ if ($shippingIncludesTax) {
346
+ $deliveryCosts = $orderEntry->getBasePrice ();
 
 
 
 
 
347
  } else {
348
+ $deliveryCosts = $dataHelper->priceWithoutTax ( $order->getTotalDeliveryCosts (), "19" );
349
  }
350
 
351
+ $rate = $this->calculateRate ( $order );
352
+
353
  $shippingAddress->setCollectShippingRates ( false );
354
  $shippingAddress->addShippingRate ( $rate );
355
  $shippingAddress->setShippingMethod ( $rate->getCode () );
356
 
357
+ $shippingAddress->setBaseShippingAmount ( $deliveryCosts );
358
+ $shippingAddress->setShippingAmount ( $deliveryCosts );
359
  $shippingAddress->setPaymentMethod ( $paymentMethod );
360
 
361
  $quoteObj->getPayment ()->importData ( array (
365
  // Dhl_MeinPaketCommon_Model_Carrier_Meinpaket::unlock ();
366
  // Dhl_MeinPaketCommon_Model_Carrier_Meinpaket::setDeliveryCosts ( $order->getTotalDeliveryCosts () );
367
 
368
+ // Required for Firegento_MageSetup
369
+ /* @var $checkoutSession Mage_Checkout_Model_Session */
370
+ $checkoutSession = Mage::getSingleton ( 'checkout/session' );
371
+ $checkoutSession->replaceQuote ( $quoteObj );
372
+
373
+ $quoteObj->setTotalsCollectedFlag ( false )->collectTotals ();
374
+ $quoteObj->setGrandTotal ( $order->getTotalPrice () );
375
  $quoteObj->save ();
376
 
377
+ // Required for Firegento_MageSetup
378
+ $checkoutSession->clear ();
379
+
380
  /* @var $quoteObj Mage_Sales_Model_Service_Quote */
381
  $serviceQuote = Mage::getModel ( 'sales/service_quote', $quoteObj );
382
  $serviceQuote->submitAll ();
384
  /* @var $orderModel Mage_Sales_Model_Order */
385
  $orderModel = $serviceQuote->getOrder ();
386
  /**
387
+ * Triggert Aufruf von authorize() auf dem payment model (ggf auch capture() )
388
  */
389
 
390
  $contactData = $order->getContactData ();
474
  }
475
 
476
  // Set store and website for loadByEmail.
477
+ $customer->setStore ( $this->_dataHelper->getMeinPaketStore () );
478
  // Could not find customer by meinpaket_buyer_id. As there can only be one customer for a given
479
  // email try to load one.
480
  $customer->loadByEmail ( $order->getContactData ()->getEmail () );
485
 
486
  // New customer
487
  // Set store and website again after loadByEmail reset it.
488
+ $customer->setStore ( $this->_dataHelper->getMeinPaketStore () );
489
  $customer->setFirstname ( $order->getBillingAddress ()->getFirstName () );
490
  $customer->setLastname ( $order->getBillingAddress ()->getLastName () );
491
  $customer->setEmail ( $order->getContactData ()->getEmail () );
520
  * @return Mage_Sales_Model_Quote_Address_Rate
521
  */
522
  protected function calculateRate(Dhl_MeinPaketCommon_Model_Xml_Response_Partial_Order $order) {
523
+ $method = Mage::getStoreConfig ( self::SHIPPING_METHOD_CONFIG );
524
+ $parts = explode ( "_", $method, 2 );
525
+
526
  $result = Mage::getModel ( 'sales/quote_address_rate' );
527
  /* @var $result Mage_Sales_Model_Quote_Address_Rate */
528
 
529
+ $result->setCarrierTitle ( 'Allyouneed' )->setCode ( $method )->setCarrier ( $parts [0] )->setMethod ( $parts [1] )->setCost ( $order->getTotalDeliveryCosts () )->setPrice ( $order->getTotalDeliveryCosts () );
 
 
530
 
531
  return $result;
532
  }
app/code/community/Dhl/MeinPaketCommon/Model/Xml/Request/DataRequest.php CHANGED
@@ -22,7 +22,7 @@ class Dhl_MeinPaketCommon_Model_Xml_Request_DataRequest extends Dhl_MeinPaketCom
22
  */
23
  public function __construct() {
24
  parent::__construct ();
25
- $this->productHelper = Mage::helper ( 'meinpaket/product' );
26
  }
27
 
28
  /**
22
  */
23
  public function __construct() {
24
  parent::__construct ();
25
+ $this->productHelper = Mage::helper ( 'meinpaketcommon/product' );
26
  }
27
 
28
  /**
app/code/community/Dhl/MeinPaketCommon/Model/Xml/Request/UploadRequest.php CHANGED
@@ -46,12 +46,19 @@ class Dhl_MeinPaketCommon_Model_Xml_Request_UploadRequest extends Dhl_MeinPaketC
46
  */
47
  protected $productHelper = null;
48
 
 
 
 
 
 
 
49
  /**
50
  * Default Constructor.
51
  */
52
  public function __construct() {
53
  parent::__construct ();
54
- $this->productHelper = Mage::helper ( 'meinpaket/product' );
 
55
  }
56
 
57
  /**
@@ -88,7 +95,7 @@ class Dhl_MeinPaketCommon_Model_Xml_Request_UploadRequest extends Dhl_MeinPaketC
88
  * @param Mage_Catalog_Model_Product $product
89
  * @return DOMElement
90
  */
91
- public function addOffer(Mage_Catalog_Model_Product $product) {
92
  $offer = $this->getDocument ()->createElement ( 'productOffer' );
93
 
94
  if (! $product->getData ( 'sync_with_dhl_mein_paket' )) {
@@ -99,16 +106,20 @@ class Dhl_MeinPaketCommon_Model_Xml_Request_UploadRequest extends Dhl_MeinPaketC
99
  // product id
100
  $offer->appendChild ( $this->getDocument ()->createElement ( 'common:productId', $product->getId () ) );
101
 
102
- // ean
103
- $ean = Mage::helper ( 'meinpaket/product' )->getEan ( $product );
104
- if (! empty ( $ean )) {
105
- $offer->appendChild ( $this->getDocument ()->createElement ( 'common:ean', $ean ) );
106
- }
107
 
108
- // manufacturer
109
- $manufacturer = $product->getAttributeText ( 'manufacturer' );
110
- if (! empty ( $manufacturer )) {
111
- $offer->appendChild ( $this->getCDATANode ( 'common:manufacturerName', $manufacturer ) );
 
 
 
 
 
 
 
 
112
  }
113
 
114
  // price
@@ -134,8 +145,31 @@ class Dhl_MeinPaketCommon_Model_Xml_Request_UploadRequest extends Dhl_MeinPaketC
134
  $offer->appendChild ( $this->getDocument ()->createElement ( 'deliverytime', $deliveryTime ) );
135
  }
136
 
137
- $this->getOffers ()->appendChild ( $offer );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
138
 
 
139
  $this->setHasData ();
140
 
141
  return $offer;
@@ -237,15 +271,25 @@ class Dhl_MeinPaketCommon_Model_Xml_Request_UploadRequest extends Dhl_MeinPaketC
237
  * @return DOMNode
238
  */
239
  protected function handleSimpleProduct(Mage_Catalog_Model_Product $product, Mage_Catalog_Model_Product $configurableProduct = null) {
240
- if ($configurableProduct == null) {
 
241
  $type = Mage::getModel ( 'catalog/product_type_configurable' );
242
  $parentIdArray = $type->getParentIdsByChild ( $product->getId () );
243
- if (isset ( $parentIdArray [0] )) {
244
- $configurableProduct = Mage::getModel ( 'catalog/product' )->load ( $parentIdArray [0] );
 
 
 
 
 
 
 
 
 
245
  }
246
  }
247
-
248
- if (! $this->productHelper->isActive($product) && $configurableProduct == null) {
249
  $this->removeProduct ( $product );
250
  return false;
251
  }
@@ -259,7 +303,7 @@ class Dhl_MeinPaketCommon_Model_Xml_Request_UploadRequest extends Dhl_MeinPaketC
259
  $productDescription->appendChild ( $productId );
260
 
261
  // ean (optional)
262
- $ean = Mage::helper ( 'meinpaket/product' )->getEan ( $product );
263
  if (! empty ( $ean )) {
264
  $productDescription->appendChild ( $this->getDocument ()->createElement ( 'common:ean', $ean ) );
265
  }
@@ -330,7 +374,7 @@ class Dhl_MeinPaketCommon_Model_Xml_Request_UploadRequest extends Dhl_MeinPaketC
330
 
331
  $this->exportAttributes ( $product, $productDescription, $configurableProduct );
332
  $this->getProductDescriptions ()->appendChild ( $productDescription );
333
- $this->addOffer ( $product );
334
 
335
  $this->setHasData ();
336
 
@@ -352,8 +396,6 @@ class Dhl_MeinPaketCommon_Model_Xml_Request_UploadRequest extends Dhl_MeinPaketC
352
  foreach ( $product->getAttributes () as $attribute ) {
353
  /* @var $attribute Mage_Eav_Model_Attribute */
354
 
355
- $isConfigurable = in_array ( $attribute->getAttributeCode (), $configurableAttributes );
356
-
357
  if (strlen ( $attribute->getMeinpaketAttribute () ) <= 0 || $attribute->getMeinpaketAttribute () == 'None') {
358
  continue;
359
  }
@@ -377,7 +419,7 @@ class Dhl_MeinPaketCommon_Model_Xml_Request_UploadRequest extends Dhl_MeinPaketC
377
  }
378
 
379
  $attributeNode = $this->getDocument ()->createElement ( "attribute" );
380
- if ($isConfigurable) {
381
  $attributeNode->setAttribute ( "variant", "true" );
382
  }
383
  $attributeNode->setAttribute ( "code", $attribute->getMeinpaketAttribute () == 'Default' ? $attribute->getAttributeCode () : $attribute->getMeinpaketAttribute () );
@@ -397,7 +439,7 @@ class Dhl_MeinPaketCommon_Model_Xml_Request_UploadRequest extends Dhl_MeinPaketC
397
  * @param Mage_Catalog_Model_Product $product
398
  */
399
  protected function handleConfigurableProduct(Mage_Catalog_Model_Product $product) {
400
- if (! $this->productHelper->isActive($product)) {
401
  $this->removeProduct ( $product );
402
  return false;
403
  }
46
  */
47
  protected $productHelper = null;
48
 
49
+ /**
50
+ *
51
+ * @var Dhl_MeinPaketCommon_Helper_Data
52
+ */
53
+ protected $dataHelper = null;
54
+
55
  /**
56
  * Default Constructor.
57
  */
58
  public function __construct() {
59
  parent::__construct ();
60
+ $this->productHelper = Mage::helper ( 'meinpaketcommon/product' );
61
+ $this->dataHelper = Mage::helper ( 'meinpaketcommon/data' );
62
  }
63
 
64
  /**
95
  * @param Mage_Catalog_Model_Product $product
96
  * @return DOMElement
97
  */
98
+ public function addOffer(Mage_Catalog_Model_Product $product, Mage_Catalog_Model_Product $configurableProduct = null, $complete = true) {
99
  $offer = $this->getDocument ()->createElement ( 'productOffer' );
100
 
101
  if (! $product->getData ( 'sync_with_dhl_mein_paket' )) {
106
  // product id
107
  $offer->appendChild ( $this->getDocument ()->createElement ( 'common:productId', $product->getId () ) );
108
 
109
+ $meinPaketId = $product->getData ( 'meinpaket_id' );
 
 
 
 
110
 
111
+ // ean
112
+ if (strlen ( $meinPaketId ) <= 0 && $complete) {
113
+ $ean = $this->productHelper->getEan ( $product );
114
+ if (! empty ( $ean )) {
115
+ $offer->appendChild ( $this->getDocument ()->createElement ( 'common:ean', $ean ) );
116
+ }
117
+
118
+ // manufacturer
119
+ $manufacturer = $product->getAttributeText ( 'manufacturer' );
120
+ if (! empty ( $manufacturer )) {
121
+ $offer->appendChild ( $this->getCDATANode ( 'common:manufacturerName', $manufacturer ) );
122
+ }
123
  }
124
 
125
  // price
145
  $offer->appendChild ( $this->getDocument ()->createElement ( 'deliverytime', $deliveryTime ) );
146
  }
147
 
148
+ if (strlen ( $meinPaketId ) <= 0 && $complete) {
149
+ /*
150
+ * // marketplace category
151
+ * $meinpaketCategory = $product->getData ( 'meinpaket_category' );
152
+ * if (strlen ( $meinpaketCategory ) > 0) {
153
+ * $mNode = $this->getDocument ()->createElement ( 'marketplaceCategory' );
154
+ * $mNode->setAttribute ( 'code', $meinpaketCategory );
155
+ * $offer->appendChild ( $mNode );
156
+ * } else {
157
+ * throw new Dhl_MeinPaketCommon_Model_Exception_MissingDataException ( $product->getId (), 'dhl_marketplace_category_id' );
158
+ * }
159
+ */
160
+
161
+ if ($configurableProduct == null) {
162
+ $type = Mage::getModel ( 'catalog/product_type_configurable' );
163
+ $parentIdArray = $type->getParentIdsByChild ( $product->getId () );
164
+ if (isset ( $parentIdArray [0] )) {
165
+ $configurableProduct = Mage::getModel ( 'catalog/product' )->setStoreId ( $this->dataHelper->getMeinPaketStoreId () )->load ( $parentIdArray [0] );
166
+ }
167
+ }
168
+
169
+ $this->exportAttributes ( $product, $offer, $configurableProduct );
170
+ }
171
 
172
+ $this->getOffers ()->appendChild ( $offer );
173
  $this->setHasData ();
174
 
175
  return $offer;
271
  * @return DOMNode
272
  */
273
  protected function handleSimpleProduct(Mage_Catalog_Model_Product $product, Mage_Catalog_Model_Product $configurableProduct = null) {
274
+ if ($configurableProduct == NULL) {
275
+ /* @var $type Mage_Catalog_Model_Product_Type_Configurable */
276
  $type = Mage::getModel ( 'catalog/product_type_configurable' );
277
  $parentIdArray = $type->getParentIdsByChild ( $product->getId () );
278
+
279
+ if (is_array ( $parentIdArray )) {
280
+ foreach ( $parentIdArray as $parentId ) {
281
+ $aProduct = Mage::getModel ( 'catalog/product' )->setStoreId ( $this->dataHelper->getMeinPaketStoreId () )->load ( $parentId );
282
+
283
+ // check resolved parent for configurable
284
+ if ($aProduct->getTypeId () == Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE) {
285
+ $configurableProduct = $aProduct;
286
+ break;
287
+ }
288
+ }
289
  }
290
  }
291
+
292
+ if (! $this->productHelper->isActive ( $product ) && $configurableProduct == null) {
293
  $this->removeProduct ( $product );
294
  return false;
295
  }
303
  $productDescription->appendChild ( $productId );
304
 
305
  // ean (optional)
306
+ $ean = $this->productHelper->getEan ( $product );
307
  if (! empty ( $ean )) {
308
  $productDescription->appendChild ( $this->getDocument ()->createElement ( 'common:ean', $ean ) );
309
  }
374
 
375
  $this->exportAttributes ( $product, $productDescription, $configurableProduct );
376
  $this->getProductDescriptions ()->appendChild ( $productDescription );
377
+ $this->addOffer ( $product, $configurableProduct, false );
378
 
379
  $this->setHasData ();
380
 
396
  foreach ( $product->getAttributes () as $attribute ) {
397
  /* @var $attribute Mage_Eav_Model_Attribute */
398
 
 
 
399
  if (strlen ( $attribute->getMeinpaketAttribute () ) <= 0 || $attribute->getMeinpaketAttribute () == 'None') {
400
  continue;
401
  }
419
  }
420
 
421
  $attributeNode = $this->getDocument ()->createElement ( "attribute" );
422
+ if (in_array ( $attribute->getAttributeCode (), $configurableAttributes )) {
423
  $attributeNode->setAttribute ( "variant", "true" );
424
  }
425
  $attributeNode->setAttribute ( "code", $attribute->getMeinpaketAttribute () == 'Default' ? $attribute->getAttributeCode () : $attribute->getMeinpaketAttribute () );
439
  * @param Mage_Catalog_Model_Product $product
440
  */
441
  protected function handleConfigurableProduct(Mage_Catalog_Model_Product $product) {
442
+ if (! $this->productHelper->isActive ( $product )) {
443
  $this->removeProduct ( $product );
444
  return false;
445
  }
app/code/community/Dhl/MeinPaketCommon/Model/Xml/Response/UploadResponse.php CHANGED
@@ -53,7 +53,7 @@ class Dhl_MeinPaketCommon_Model_Xml_Response_UploadResponse extends Dhl_MeinPake
53
  public function storeMeinPaketIds() {
54
  foreach ( $this->productDescriptionConfirmations as $conf ) {
55
  /* @var $product Mage_Catalog_Model_Product */
56
- $product = Mage::getModel ( 'catalog/product' )->load ( $conf->getProductId () );
57
  if ($product->getData ( 'meinpaket_id' ) != $conf->getMeinPaketId ()) {
58
  $product->setData ( 'meinpaket_id', $conf->getMeinPaketId () );
59
  $product->getResource ()->saveAttribute ( $product, 'meinpaket_id' );
@@ -62,7 +62,7 @@ class Dhl_MeinPaketCommon_Model_Xml_Response_UploadResponse extends Dhl_MeinPake
62
 
63
  foreach ( $this->productDeletionConfirmations as $conf ) {
64
  /* @var $product Mage_Catalog_Model_Product */
65
- $product = Mage::getModel ( 'catalog/product' )->load ( $conf->getProductId () );
66
  if ($product->getData ( 'meinpaket_id' ) != $conf->getMeinPaketId ()) {
67
  $product->setData ( 'meinpaket_id', $conf->getMeinPaketId () );
68
  $product->getResource ()->saveAttribute ( $product, 'meinpaket_id' );
@@ -76,7 +76,7 @@ class Dhl_MeinPaketCommon_Model_Xml_Response_UploadResponse extends Dhl_MeinPake
76
  /* @var $conf Dhl_MeinPaketCommon_Model_Xml_Response_Partial_ProductId */
77
  foreach ( $this->productDeletionConfirmations as $conf ) {
78
  /* @var $product Mage_Catalog_Model_Product */
79
- $product = Mage::getModel ( 'catalog/product' )->load ( $conf->getProductId () );
80
  $product->setData ( 'meinpaket_id', null );
81
  $product->getResource ()->saveAttribute ( $product, 'meinpaket_id' );
82
  }
53
  public function storeMeinPaketIds() {
54
  foreach ( $this->productDescriptionConfirmations as $conf ) {
55
  /* @var $product Mage_Catalog_Model_Product */
56
+ $product = Mage::getModel ( 'catalog/product' )->setStoreId ( Mage::helper ( 'meinpaketcommon/data' )->getMeinPaketStoreId () )->load ( $conf->getProductId () );
57
  if ($product->getData ( 'meinpaket_id' ) != $conf->getMeinPaketId ()) {
58
  $product->setData ( 'meinpaket_id', $conf->getMeinPaketId () );
59
  $product->getResource ()->saveAttribute ( $product, 'meinpaket_id' );
62
 
63
  foreach ( $this->productDeletionConfirmations as $conf ) {
64
  /* @var $product Mage_Catalog_Model_Product */
65
+ $product = Mage::getModel ( 'catalog/product' )->setStoreId ( Mage::helper ( 'meinpaketcommon/data' )->getMeinPaketStoreId () )->load ( $conf->getProductId () );
66
  if ($product->getData ( 'meinpaket_id' ) != $conf->getMeinPaketId ()) {
67
  $product->setData ( 'meinpaket_id', $conf->getMeinPaketId () );
68
  $product->getResource ()->saveAttribute ( $product, 'meinpaket_id' );
76
  /* @var $conf Dhl_MeinPaketCommon_Model_Xml_Response_Partial_ProductId */
77
  foreach ( $this->productDeletionConfirmations as $conf ) {
78
  /* @var $product Mage_Catalog_Model_Product */
79
+ $product = Mage::getModel ( 'catalog/product' )->setStoreId ( Mage::helper ( 'meinpaketcommon/data' )->getMeinPaketStoreId () )->load ( $conf->getProductId () );
80
  $product->setData ( 'meinpaket_id', null );
81
  $product->getResource ()->saveAttribute ( $product, 'meinpaket_id' );
82
  }
app/code/community/Dhl/MeinPaketCommon/controllers/Adminhtml/AsyncController.php CHANGED
@@ -8,6 +8,14 @@ class Dhl_MeinPaketCommon_Adminhtml_AsyncController extends Mage_Adminhtml_Contr
8
  $this->loadLayout ()->_setActiveMenu ( 'meinpaketcommon/async' )->_addBreadcrumb ( Mage::helper ( 'meinpaketcommon' )->__ ( 'Async' ), Mage::helper ( 'meinpaketcommon' )->__ ( 'Async' ) );
9
  return $this;
10
  }
 
 
 
 
 
 
 
 
11
  public function indexAction() {
12
  $this->_initAction ()->renderLayout ();
13
  }
8
  $this->loadLayout ()->_setActiveMenu ( 'meinpaketcommon/async' )->_addBreadcrumb ( Mage::helper ( 'meinpaketcommon' )->__ ( 'Async' ), Mage::helper ( 'meinpaketcommon' )->__ ( 'Async' ) );
9
  return $this;
10
  }
11
+ /**
12
+ * (non-PHPdoc)
13
+ *
14
+ * @see Mage_Adminhtml_Controller_Action::_isAllowed()
15
+ */
16
+ protected function _isAllowed() {
17
+ return Mage::getSingleton ( 'admin/session' )->isAllowed ( 'admin/meinpaket/async' );
18
+ }
19
  public function indexAction() {
20
  $this->_initAction ()->renderLayout ();
21
  }
app/code/community/Dhl/MeinPaketCommon/controllers/Adminhtml/LogController.php CHANGED
@@ -8,6 +8,14 @@ class Dhl_MeinPaketCommon_Adminhtml_LogController extends Mage_Adminhtml_Control
8
  $this->loadLayout ()->_setActiveMenu ( 'meinpaketcommon/log' )->_addBreadcrumb ( Mage::helper ( 'meinpaketcommon' )->__ ( 'Log' ), Mage::helper ( 'meinpaketcommon' )->__ ( 'Log' ) );
9
  return $this;
10
  }
 
 
 
 
 
 
 
 
11
  public function indexAction() {
12
  $this->_initAction ()->renderLayout ();
13
  }
8
  $this->loadLayout ()->_setActiveMenu ( 'meinpaketcommon/log' )->_addBreadcrumb ( Mage::helper ( 'meinpaketcommon' )->__ ( 'Log' ), Mage::helper ( 'meinpaketcommon' )->__ ( 'Log' ) );
9
  return $this;
10
  }
11
+
12
+ /**
13
+ * (non-PHPdoc)
14
+ * @see Mage_Adminhtml_Controller_Action::_isAllowed()
15
+ */
16
+ protected function _isAllowed() {
17
+ return Mage::getSingleton ( 'admin/session' )->isAllowed ( 'admin/meinpaket/log' );
18
+ }
19
  public function indexAction() {
20
  $this->_initAction ()->renderLayout ();
21
  }
app/code/community/Dhl/MeinPaketCommon/controllers/Adminhtml/OrderImportController.php CHANGED
@@ -20,6 +20,14 @@ class Dhl_MeinPaketCommon_Adminhtml_OrderImportController extends Mage_Adminhtml
20
  return $this;
21
  }
22
 
 
 
 
 
 
 
 
 
23
  /**
24
  * Default controller action.
25
  *
20
  return $this;
21
  }
22
 
23
+ /**
24
+ * (non-PHPdoc)
25
+ * @see Mage_Adminhtml_Controller_Action::_isAllowed()
26
+ */
27
+ protected function _isAllowed() {
28
+ return Mage::getSingleton ( 'admin/session' )->isAllowed ( 'admin/meinpaket/order_import' );
29
+ }
30
+
31
  /**
32
  * Default controller action.
33
  *
app/code/community/Dhl/MeinPaketCommon/etc/adminhtml.xml CHANGED
@@ -4,14 +4,14 @@
4
  <meinpaket>
5
  <title>Allyouneed</title>
6
  <children>
7
- <meinpaket_log translate="title" module="meinpaketcommon">
8
  <title>Log</title>
9
  <action>meinpaketcommon/adminhtml_log</action>
10
- </meinpaket_log>
11
- <meinpaket_async translate="title" module="meinpaketcommon">
12
  <title>Async</title>
13
  <action>meinpaketcommon/adminhtml_async</action>
14
- </meinpaket_async>
15
  </children>
16
  <sort_order>90</sort_order>
17
  <class>meinpaket</class>
@@ -21,6 +21,23 @@
21
  <resources>
22
  <admin>
23
  <children>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
24
  <system>
25
  <children>
26
  <config>
4
  <meinpaket>
5
  <title>Allyouneed</title>
6
  <children>
7
+ <log translate="title" module="meinpaketcommon">
8
  <title>Log</title>
9
  <action>meinpaketcommon/adminhtml_log</action>
10
+ </log>
11
+ <async translate="title" module="meinpaketcommon">
12
  <title>Async</title>
13
  <action>meinpaketcommon/adminhtml_async</action>
14
+ </async>
15
  </children>
16
  <sort_order>90</sort_order>
17
  <class>meinpaket</class>
21
  <resources>
22
  <admin>
23
  <children>
24
+ <meinpaket translate="title">
25
+ <title>Allyouneed</title>
26
+ <children>
27
+ <async translate="title">
28
+ <title>Async</title>
29
+ <sort_order>40</sort_order>
30
+ </async>
31
+ <log translate="title">
32
+ <title>Log</title>
33
+ <sort_order>41</sort_order>
34
+ </log>
35
+ <order_import translate="title">
36
+ <title>Order Import</title>
37
+ <sort_order>42</sort_order>
38
+ </order_import>
39
+ </children>
40
+ </meinpaket>
41
  <system>
42
  <children>
43
  <config>
app/code/community/Dhl/MeinPaketCommon/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Dhl_MeinPaketCommon>
5
- <version>1.1.0</version>
6
  </Dhl_MeinPaketCommon>
7
  </modules>
8
  <admin>
@@ -106,8 +106,11 @@
106
  <proxy_port></proxy_port>
107
  </endpoint>
108
  <shipment>
109
- <default_shipment_method>flatrate_flatrate</default_shipment_method>
110
  </shipment>
 
 
 
111
  <cron>
112
  <async>*/10 * * * *</async>
113
  <cleanup>0 6 * * *</cleanup>
2
  <config>
3
  <modules>
4
  <Dhl_MeinPaketCommon>
5
+ <version>1.3.0</version>
6
  </Dhl_MeinPaketCommon>
7
  </modules>
8
  <admin>
106
  <proxy_port></proxy_port>
107
  </endpoint>
108
  <shipment>
109
+ <default_shipment_method>allyouneed_standard</default_shipment_method>
110
  </shipment>
111
+ <customer>
112
+ <default_group>1</default_group>
113
+ </customer>
114
  <cron>
115
  <async>*/10 * * * *</async>
116
  <cleanup>0 6 * * *</cleanup>
app/code/community/Dhl/MeinPaketCommon/etc/system.xml CHANGED
@@ -19,7 +19,7 @@
19
  <show_in_website>1</show_in_website>
20
  <show_in_store>1</show_in_store>
21
  <frontend_class>allyouneed</frontend_class>
22
- <fields translate="label">
23
  <view translate="label">
24
  <label>Store View</label>
25
  <frontend_type>select</frontend_type>
@@ -165,8 +165,18 @@
165
  <sort_order>10</sort_order>
166
  <show_in_default>1</show_in_default>
167
  <show_in_website>1</show_in_website>
168
- <show_in_store>0</show_in_store>
169
  </default_email>
 
 
 
 
 
 
 
 
 
 
170
  </fields>
171
  </customer>
172
  <cron translate="label">
19
  <show_in_website>1</show_in_website>
20
  <show_in_store>1</show_in_store>
21
  <frontend_class>allyouneed</frontend_class>
22
+ <fields>
23
  <view translate="label">
24
  <label>Store View</label>
25
  <frontend_type>select</frontend_type>
165
  <sort_order>10</sort_order>
166
  <show_in_default>1</show_in_default>
167
  <show_in_website>1</show_in_website>
168
+ <show_in_store>1</show_in_store>
169
  </default_email>
170
+ <default_group translate="label comment">
171
+ <label>Default customer group</label>
172
+ <comment><![CDATA[This default customer group used for customers imported from Allyouneed.]]></comment>
173
+ <frontend_type>select</frontend_type>
174
+ <source_model>adminhtml/system_config_source_customer_group</source_model>
175
+ <sort_order>20</sort_order>
176
+ <show_in_default>1</show_in_default>
177
+ <show_in_website>1</show_in_website>
178
+ <show_in_store>1</show_in_store>
179
+ </default_group>
180
  </fields>
181
  </customer>
182
  <cron translate="label">
app/code/community/Dhl/MeinPaketCommon/sql/meinpaketcommon_setup/mysql4-upgrade-1.1.1-1.2.0.php ADDED
@@ -0,0 +1,11 @@
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ /* @var $installer Dhl_MeinPaketCommon_Model_Resource_Eav_Mysql4_Setup */
4
+ $installer = $this;
5
+ $installer->startSetup ();
6
+
7
+ $installer->run ( "
8
+ ALTER TABLE {$this->getTable('meinpaketcommon/log')} ADD `url` varchar(255) AFTER `request_id`;
9
+ " );
10
+
11
+ $installer->endSetup ();
app/code/community/Dhl/Postpay/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Dhl_Postpay>
5
- <version>1.1.0</version>
6
  </Dhl_Postpay>
7
  </modules>
8
  <admin>
2
  <config>
3
  <modules>
4
  <Dhl_Postpay>
5
+ <version>1.2.0</version>
6
  </Dhl_Postpay>
7
  </modules>
8
  <admin>
app/design/adminhtml/default/default/template/meinpaket/catalog/product/matching/tab.phtml CHANGED
@@ -22,14 +22,16 @@
22
  </tr>
23
  <tr>
24
  <td class="label"><label for="mp_ean">EAN</label></td>
25
- <td class="value"><?php echo Mage::helper('meinpaket/product')->getEAN($product); ?></td>
26
  <td class="value"><input id="mp_ean" name="mp_ean" type="checkbox"
27
  value="1" class="input-checkbox" checked="checked"></td>
28
  </tr>
 
29
  <tr>
30
  <td colspan="3"><button onclick="loadSuggestions(); return false;"
31
  class="scalable btn-wysiwyg">Load suggestions</button></td>
32
  </tr>
 
33
  </tbody>
34
  </table>
35
  </div>
22
  </tr>
23
  <tr>
24
  <td class="label"><label for="mp_ean">EAN</label></td>
25
+ <td class="value"><?php echo Mage::helper('meinpaketcommon/product')->getEAN($product); ?></td>
26
  <td class="value"><input id="mp_ean" name="mp_ean" type="checkbox"
27
  value="1" class="input-checkbox" checked="checked"></td>
28
  </tr>
29
+ <?php if(Mage::getSingleton('admin/session')->isAllowed('admin/meinpaket/matching')):?>
30
  <tr>
31
  <td colspan="3"><button onclick="loadSuggestions(); return false;"
32
  class="scalable btn-wysiwyg">Load suggestions</button></td>
33
  </tr>
34
+ <?php endif;?>
35
  </tbody>
36
  </table>
37
  </div>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>DHL_Allyouneed</name>
4
- <version>2.2.2</version>
5
  <stability>stable</stability>
6
  <license>--</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>The Extension connects your Magento shop with DHL Allyouneed.</description>
11
  <notes>--</notes>
12
  <authors><author><name>DHL Vertriebs GmbH</name><user>ybmdeutschland</user><email>support@meinpaket.de</email></author></authors>
13
- <date>2015-06-02</date>
14
- <time>08:49:46</time>
15
- <contents><target name="magecommunity"><dir><dir name="Dhl"><dir name="MeinPaket"><dir><dir name="Block"><dir name="Adminhtml"><dir name="Backlog"><dir name="Product"><file name="Grid.php" hash="7541700fffd1811943ce7d1d5f1ecdaf"/></dir><file name="Product.php" hash="d0fa6e92c7a2349cb2ef578eb1dad702"/></dir><dir name="BestPrice"><file name="Grid.php" hash="adb8a1085e086f3d1dc57a489619ff5d"/></dir><file name="BestPrice.php" hash="b4f9912d464830a48fd5154c45b0c040"/><dir name="Catalog"><dir name="Product"><dir name="Matching"><file name="Result.php" hash="135446bcf25b60bb017e29b15881daa8"/><file name="Tab.php" hash="3d5c316f511ca64dfa511f04ac4b4a14"/></dir></dir></dir><dir name="CategoryImport"><file name="Import.php" hash="47f0969b175e1480efe8a97480c169da"/><file name="Index.php" hash="745b3c71e101599fbba7a7fd275362c9"/></dir><file name="LeftMenu.php" hash="b60dea4f9e9a39b663cab89be8e32b97"/><dir name="OrderImport"><file name="Index.php" hash="b45724d6ff1fcda6102b3147f3a66a94"/></dir><dir name="ProductExport"><file name="Export.php" hash="e12ef6d9b52a9607820fbcd5e58e76ca"/><file name="Index.php" hash="65cf2306ad93f387f525ec66cec1abee"/><file name="List.php" hash="4a32ced740d35ebb7a10d0fffa782223"/></dir><file name="Steps.php" hash="ffb3f688b43cd0c1f457b89c84e68b7f"/><file name="Version.php" hash="476febd9f5d12ac999bdc7a6d646fe20"/></dir></dir><dir name="Helper"><file name="Attribute.php" hash="36cf44cf54204426e3f50864381a6443"/><file name="Backlog.php" hash="51c08b4ef137799d0e7dbf900543ab3e"/><file name="Cron.php" hash="b320de066adaec731a4ce5d77397a1e8"/><file name="Data.php" hash="da9a067e866242802d77e67b8e319358"/><file name="Order.php" hash="e3dca5761fa8e5e4171a9712b14b5c30"/><file name="Product.php" hash="d1bb6bf5045b569ba349ec2b41dfffd3"/><file name="Shipment.php" hash="c8764cf370aded8e4d3c55e8c218a879"/></dir><dir name="Model"><dir name="Attribute"><file name="Mapping.php" hash="7d8a8d9e18f7c6019ae71a7032061ab7"/></dir><dir name="Backlog"><file name="Product.php" hash="a2d547dcfba28c80819155a73ff5cff4"/></dir><file name="BestPrice.php" hash="b75de965445df6125e115d0d89add52c"/><file name="Category.php" hash="d0f5804e7900915f1c03364b079a7dc5"/><file name="Cron.php" hash="6f418837cc6e452eb8470864f6d4b396"/><dir name="Entity"><dir name="Attribute"><dir name="Frontend"><file name="LabelTranslation.php" hash="7f4b3b49b6e12dadd768aee95e041579"/></dir><dir name="Source"><file name="Carrier.php" hash="65770c58617deb2dce75d8e83e055d79"/><file name="MeinPaketCategory.php" hash="17f784c2d79bfd847dd6472dca661334"/><file name="ProductAttribute.php" hash="aba17fe2a9acb85d0483926c3d5ba9a8"/><file name="ProductSyncMode.php" hash="39db6c156e9100ab59384756ec9ac2c5"/><file name="Taxclass.php" hash="696e7dda6d0bd21eeceb61adc0121cd6"/><file name="Taxrate.php" hash="40bbb2336441fa02916ab992279961e8"/></dir></dir></dir><dir name="Exception"><file name="InvalidDataException.php" hash="dcbfbe06f3d0190d5f4a9f0b47973bf2"/><file name="MissingDataException.php" hash="377d6cc783aa6e8973728a77e1e5b8a9"/></dir><dir name="Mysql4"><dir name="Backlog"><dir name="Product"><file name="Collection.php" hash="2711f602d90e22ea72b773003cf38ef4"/></dir><file name="Product.php" hash="d46057bf2e8b93b32b23653222599316"/></dir><dir name="BestPrice"><file name="Collection.php" hash="fedcad4595269a646ff1c452bed87b00"/></dir><file name="BestPrice.php" hash="79399000e407b6a22489d0dbfedd6f34"/><dir name="Category"><file name="Collection.php" hash="06fd9a509c1ef252c0b75f6acda1b9eb"/></dir><file name="Category.php" hash="449c4f90fe5e797ca587025c63c745c3"/></dir><file name="Observer.php" hash="07e0c82cfa3d24feef9a1f3dd3599ada"/><dir name="Payment"><dir name="Method"><file name="Meinpaket.php" hash="dcb6ac810be4d0bb9e426464be91610d"/></dir></dir><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="6a8952042b65c89685e24b3b503c0d67"/></dir></dir></dir><dir name="Service"><dir name="MarketplaceCategoryImport"><file name="ImportService.php" hash="bf0c889ce83b0afe084c20f97288370e"/><file name="Result.php" hash="cdebaf351ccd1c7aa285801701d32e7f"/></dir><dir name="Product"><dir name="Export"><dir name="Exception"><file name="InvalidEan.php" hash="bc88e3bc48a8a96e45079054290ae68c"/></dir></dir><file name="Export.php" hash="df1c3b905d299deb40b16d9452bcbf02"/></dir><dir name="ProductData"><file name="RequestService.php" hash="028b969756915acb87ab4daced2fd7ac"/></dir><dir name="Result"><file name="Abstract.php" hash="c7d84905431b651779dc1011f246983b"/><file name="Upload.php" hash="4ddf194a126ce18938610f61fcc1260d"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Attributes.php" hash="e6cd11540ebf6bc87f4d949d81285703"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Backlog"><file name="ProductController.php" hash="bb1f8850442ff1950549b21a2dcf74c5"/></dir><file name="BestPriceController.php" hash="a0eafd1b7ec08351bf3c02bbf66509c6"/><file name="CategoryImportController.php" hash="e614f4bad2b173e067611e4017c7b1a8"/><file name="MatchingController.php" hash="f568a8a7d331264944d1586aa567e6ee"/><file name="ProductExportController.php" hash="19bdeee189cb404f1a0ffdfe21c66087"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="94c3acad50c77221b674d93c63e50e26"/><file name="config.xml" hash="805e78cc1999a74caf3e72099bb47f6d"/><file name="system.xml" hash="381fa94cf8cef54db494eea83f26dff1"/></dir><dir name="sql"><dir name="meinpaket_setup"><file name="mysql4-install-1.0.0.php" hash="f517a9fbaa8e58738d67fc146f493496"/><file name="mysql4-upgrade-1.0.0-1.1.0.php" hash="b52cd860cbc35cff0f704a033b296cdf"/><file name="mysql4-upgrade-1.1.0-2.0.0.php" hash="199b74750e105a4e215bb268dceeb897"/><file name="mysql4-upgrade-2.1.0-2.2.0.php" hash="2312e1c6c3d2c254383b0f0e163cd243"/></dir></dir></dir></dir><dir name="Postpay"><dir><dir name="Block"><dir name="Adminhtml"><file name="Version.php" hash="887b1a63cd09847ba7ab3392bd4f9602"/></dir><file name="Checkout.php" hash="ec8b0f2764d863f03dec0167617510a6"/><dir name="Payment"><dir name="Form"><file name="Standard.php" hash="6aca4f231c317c45ac1556d39639d84f"/></dir><dir name="Info"><file name="Standard.php" hash="45252ddc1f9ebb332ef75efa5f868432"/></dir></dir></dir><dir name="Helper"><file name="Cron.php" hash="c2391d5d085c31f2650655e8acdbfb97"/><file name="Data.php" hash="418df17f5f760dc47bba8bb815d77c58"/></dir><dir name="Model"><file name="Cart.php" hash="e599a64fec791a587552a020b563b426"/><file name="Cron.php" hash="7f563b1e5fabd6534a72ad8239af341d"/><dir name="Mysql4"><dir name="Cart"><file name="Collection.php" hash="3b5150eb69a37a738e3f8494db0f4af1"/></dir><file name="Cart.php" hash="74042698f6fb9f2c7ca054d17f1ff0a2"/></dir><file name="Observer.php" hash="8a9eb2111c0a450e460f10e2b2a721eb"/><dir name="Payment"><dir name="Method"><file name="Express.php" hash="91259cee6e39f7c993a823edbaab4817"/><file name="Standard.php" hash="30d139303e4f80c1ed8c03397666c890"/></dir></dir><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="ac36d5a7a1988eab4dad69efd472c50f"/></dir></dir></dir><dir name="Service"><dir name="Order"><file name="ImportService.php" hash="60c7e7a116d65b2bb3a1e15f03860558"/></dir></dir></dir><dir name="controllers"><file name="CheckoutController.php" hash="7a0801e7c03be05beb8c38004dea1464"/><file name="NotificationController.php" hash="41a608eddf5b891ca0b26b1ef1323691"/><file name="ResponseController.php" hash="79cb81c28fe2460fac0be802a8b598b2"/></dir><dir name="etc"><file name="config.xml" hash="8c25198b05cac404eca2c2fe3e81d35b"/><file name="system.xml" hash="43de1564100406a0cfcf69096f89b41a"/></dir><dir name="sql"><dir name="postpay_setup"><file name="mysql4-install-1.0.0.php" hash="8a5f877376e1df9b1a8bde8d4ce70158"/></dir></dir></dir></dir><dir name="MeinPaketCommon"><dir><dir name="Block"><dir name="Adminhtml"><dir name="Async"><file name="Grid.php" hash="dbf8ebeac3b98728c3cef8785c83c897"/></dir><file name="Async.php" hash="7169a4ea405f54ae1d6da4c56c302fcc"/><dir name="Log"><file name="Grid.php" hash="d371551816e9335e062424e648362ce5"/></dir><file name="Log.php" hash="36a68e5de0cf7dfb87e3b090c05c1e9c"/><file name="Version.php" hash="28defa5c89727f8c3a877affb55d0443"/></dir></dir><dir name="Helper"><file name="Address.php" hash="def05195630f6f98802481d228b4f25e"/><file name="Attribute.php" hash="905db640dbe49889e273aeb7415b2441"/><file name="Cron.php" hash="023eb7080558ebd43af77c1846a44534"/><file name="Data.php" hash="11281a212ef8962b86e4423228bb2d8f"/><file name="Order.php" hash="736798b03eefd167e60854ad2e07792b"/><file name="Product.php" hash="ef60cadd260066b6109711a8e2522c9a"/><file name="Shipment.php" hash="4f62b24147d2998762ca74975e4cc379"/></dir><dir name="Model"><file name="Async.php" hash="3112120abd4ff2773dbcf19dedfd4044"/><dir name="Carrier"><file name="Allyouneed.php" hash="25eaf021d05a89e988c9370f25fd56cf"/><file name="Meinpaket.php" hash="b16814df68414d1fb6e795eadc4d6e83"/></dir><dir name="Client"><file name="BadHttpReturnCodeException.php" hash="3f3d67278be542e42bb882f387c04b67"/><file name="HttpException.php" hash="963bc4b8d30d2996a2a08b4c8aaa6b8f"/><file name="HttpTimeoutException.php" hash="d633742d26c8c5438543c1bbdf5c09bd"/><file name="XmlOverHttp.php" hash="91c8871b396a121abd3ba2dca8a60b4e"/></dir><file name="Cron.php" hash="35c06419c8aa9c6413f8304fda80c3ff"/><dir name="Entity"><dir name="Attribute"><dir name="Source"><file name="Carrier.php" hash="437c70fc9b4e8fa719bdd19676bbbacf"/></dir></dir></dir><dir name="Exception"><file name="InvalidDataException.php" hash="808caf989c24f1146d47fc610be6e131"/><file name="MissingDataException.php" hash="67a06069dcb66c02235f636b6790a62d"/></dir><file name="Log.php" hash="516fc34067f4573d160100d7a975a66c"/><dir name="Mysql4"><dir name="Async"><file name="Collection.php" hash="d5f6fbe4a4be75181844eddfbbd557cf"/></dir><file name="Async.php" hash="2120d8c0411c8773853cee4c5925467a"/><dir name="Log"><file name="Collection.php" hash="9bba87a636029d675e1ceda42f96dbc4"/></dir><file name="Log.php" hash="a09be611512f4dc95880e6e00dab93ca"/></dir><file name="Observer.php" hash="15812db421a573332a95f35e9acb9be9"/><dir name="Payment"><dir name="Method"><file name="Allyouneed.php" hash="663bf3c0f796e41a36eed0c277c0af42"/><file name="Meinpaket.php" hash="fdbc24e8330ecbb71243e1f4b5b83bc3"/></dir></dir><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="ce3a02f9c90e0a1f04a6202305c72ff4"/></dir></dir></dir><dir name="Service"><file name="Abstract.php" hash="406fb92c370df8e93aaffacbad56937b"/><file name="Async.php" hash="5dba3892bc2b78846f2ca7593385a1bc"/><dir name="Order"><dir name="CancellationService"><file name="Result.php" hash="fd81666a5855ea6b25904e14d498ea20"/></dir><file name="CancellationService.php" hash="a6806a3531b596a729a418688ba51dcc"/><file name="ImportService.php" hash="40fab63338fd571dbdbe2f1afefa2d14"/><dir name="RefundExportService"><file name="Result.php" hash="dcfd1f479709368b446041674ee445d8"/></dir><file name="RefundExportService.php" hash="7ab8222a77e76517247f7f710d60b590"/><dir name="ShipmentExportService"><file name="Result.php" hash="0ba713e725c87d0bc82321582e3fe776"/></dir><file name="ShipmentExportService.php" hash="3045ed7ffb7f6a1f4c592e49832577f9"/></dir><dir name="Result"><file name="Abstract.php" hash="c7d84905431b651779dc1011f246983b"/><file name="Upload.php" hash="51438929f66a7efe3541511b6966ea09"/></dir></dir><dir name="System"><file name="MemoryLimiter.php" hash="813d89b8c21834fb911acc8e59be950c"/></dir><dir name="Validation"><file name="ValidationInterface.php" hash="d11950e6d4a7b52e3784867e8d8d2230"/><dir name="Validator"><file name="CDATAContent.php" hash="425678e9cf44efee9d884c20e4db1f14"/><file name="Ean.php" hash="7bab4c07ebcbdf3ce9e087ff20976d1a"/><file name="IntGreaterZero.php" hash="682c11f5cf24cafcef61350194a65be1"/><file name="NonEmptyString.php" hash="7075a72eace8e1f8c5bc5b61a5a25231"/><file name="StringMaxLength.php" hash="c19f729ff39b5b6b438635fe9bd9c6bf"/><file name="Url.php" hash="7b1f83a803fd8788ad4b22aaa982d04f"/></dir><file name="ValidatorChain.php" hash="72148d630805652276c446ebef817f47"/><file name="ValidatorInterface.php" hash="df41d71f7970d758b18bf36c2e49f6f1"/></dir><dir name="Xml"><file name="AbstractXmlPartial.php" hash="303a1e75e4ba719683f09ea9a5cc2743"/><file name="AbstractXmlRequest.php" hash="9a72dc1e6fe6cc1f027d1f339e6bc0f4"/><file name="InvalidXmlException.php" hash="22c021f43b7df35045814cd1ca714968"/><dir name="Request"><file name="AsynchronousStatusRequest.php" hash="4b17665dfef64f23d366f671a06634e3"/><file name="DataRequest.php" hash="af14f72b8c11013cfed42a0b1cbd22bc"/><file name="DownloadRequest.php" hash="05e941a0db71e679d5e3bce00bd5da8d"/><file name="NotificationRequest.php" hash="2902af863aaa33df93cc6e8cfdbf4b8c"/><file name="QueryRequest.php" hash="31746798830da6d1a5909e9f6761e5e1"/><file name="SubmitCartRequest.php" hash="bda8ba8a1662b59e49ddb974219cacf4"/><file name="UploadRequest.php" hash="aaa0e0cc96cb8b3ff43bf80f0ed4c700"/></dir><dir name="Response"><file name="Abstract.php" hash="f7e963bf5586d26347c4d1a6887a4b79"/><file name="AsynchronousStatusResponse.php" hash="6571d1b3093cd73e7eda7ff940df4453"/><file name="DataResponse.php" hash="672c55dd8e770219eac74214726cb5ef"/><file name="DownloadResponse.php" hash="831f43cece257d44fe65d02304362a8c"/><file name="NotificationResponse.php" hash="be7626da7ef2f744f183228110aabbea"/><dir name="Partial"><file name="Address.php" hash="d9ea71d56eb49fe3a512edd412293922"/><file name="Attribute.php" hash="4c27a169c0c773afde7502d6704ee372"/><file name="Category.php" hash="2b040bd3b89121ba28fef0ae07915915"/><file name="CategoryId.php" hash="09f6b3ecf29c4d3a16d37978efd53b4a"/><dir name="DataResponse"><file name="BestPrice.php" hash="e545a040a9201c3c8a71d4b410dcfc4d"/><file name="Confirmation.php" hash="b93b06d18277c10899535d91c1b71829"/><file name="MerchantData.php" hash="f03d2b35691c4356c43251e3c1c1fd20"/><file name="ProductData.php" hash="ab11140f6a0c4556a558d317651db82b"/><file name="QuotaData.php" hash="feb7180ff8c332decc938c1394ab8018"/></dir><dir name="NotificationResponse"><file name="Confirmation.php" hash="62225a96f3c9ce1047afc3f2c04b44ea"/><file name="Consignment.php" hash="20cb98f68cb94033d7abc5cb29ba47a4"/><file name="Credit.php" hash="7dfa1b551c938bbdbcab3e7f5ca4a86e"/><file name="Return.php" hash="d2538c678241727e3fe996d800da75b1"/></dir><dir name="Order"><file name="ContactData.php" hash="27cd1f6a5f8125352f3c383ab40e18af"/><file name="Entry.php" hash="f925387971c3a4e90bf3a66735f78025"/></dir><file name="Order.php" hash="470ed2a1671600318de784fedc34dbb9"/><file name="ProductId.php" hash="098e038cb611d92a65aa8a305567a2d0"/><file name="VariantConfiguration.php" hash="c3840d3e11cc2cc2c50d1f4f03bca963"/></dir><file name="QueryResponse.php" hash="300bfcfdb7f52380b207b45fede50e8e"/><file name="SubmitCartResponse.php" hash="82743d5832c4a12675796bbbde6f72e0"/><file name="UploadResponse.php" hash="36ac43b1e83c64be86307a6c1b7faf3d"/></dir><file name="XmlBuildException.php" hash="72ee8a17dab2c457bb821cd36bbff689"/><file name="XmlResponseParser.php" hash="94502547e6f7495e708652f72155c020"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="AsyncController.php" hash="480e99dbe107a07d88e60950e25479eb"/><file name="LogController.php" hash="b8a5edb6c275746515b553faa6472687"/><file name="OrderImportController.php" hash="aad84807f8e3c85f79609106b948c608"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="149473dc725145be4791a09d898b3115"/><file name="config.xml" hash="c49c7542ebb894d50e902e8d2b059c42"/><file name="system.xml" hash="f4301e5eb845c4f59c1438eb3467ae9a"/></dir><dir name="sql"><dir name="meinpaketcommon_setup"><file name="mysql4-install-1.0.0.php" hash="619358ad78ac3123511e8d77f11dc39f"/><file name="mysql4-upgrade-1.0.0-1.1.0.php" hash="f44902d977f8aca8e25fd3f716b6d9ab"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="Dhl_MeinPaket.xml" hash="b2ab0b71945c9849bbabe9cac0280beb"/><file name="Dhl_Postpay.xml" hash="26852f055604828ffca341f7437db998"/><file name="Dhl_MeinPaketCommon.xml" hash="b926a30bca6162be2a951f9fb0f62e00"/></dir></dir></target><target name="mage"><dir><dir name="shell"><file name="dhlmeinpaket-category-import.php" hash="b7c47a9b557e7fae4c5309ed95628ab6"/><file name="dhlmeinpaket-product-export.php" hash="9cfb888cdec7047a488fd68e84f5c495"/><file name="dhlmeinpaket-request-bestprice.php" hash="8bbcdd8eb442861f7e94d44b8db99226"/><file name="dhlmeinpaket-order-import.php" hash="7ff812c3c5dbb27d88554946c7e1edab"/></dir></dir></target><target name="magedesign"><dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="meinpaket.xml" hash="3854556688b7e27a8e7eda0cdf2b6610"/><file name="postpay.xml" hash="890708f41152cb5326040006a0d13bf1"/><file name="meinpaketcommon.xml" hash="3854556688b7e27a8e7eda0cdf2b6610"/></dir><dir name="template"><dir name="postpay"><dir><dir name="checkout"><file name="image.phtml" hash="9283259a1e502907c0ba1c659f4ffe1b"/></dir><dir name="payment"><file name="redirect.phtml" hash="4d6e571020670c2069a2323b54f707ea"/></dir></dir><file name="checkout.phtml" hash="424e3ad9ab6f20dba21412ed9de315e6"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="meinpaket.xml" hash="973b9b6f616f8da3528ab68cc379819c"/><file name="postpay.xml" hash="5bef4c0511b6e60ed9abf1503849809e"/><file name="meinpaketcommon.xml" hash="4563e3cf8fc469dcecf1c8ff88e26cf7"/></dir><dir name="template"><dir name="meinpaket"><dir><dir name="catalog"><dir name="product"><dir name="matching"><file name="result.phtml" hash="fcc1b10a90944f5657e7c39bda175d44"/><file name="tab.phtml" hash="bfa9945e79b7ebbf841b95ef99c1fc5d"/></dir></dir></dir><dir name="category"><dir name="import"><file name="import.phtml" hash="d749033dde8fe39bc006d9ac2c458ef1"/><file name="index.phtml" hash="cd832201909c7cbfb76f165fe29c0f03"/></dir></dir></dir><file name="leftmenu.phtml" hash="4afb8d200ed8ceddf2f682c5911c565c"/><file name="steps.phtml" hash="70a343086b4559dc0e77173d9a799e39"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir><dir name="de_DE"><file name="Dhl_MeinPaket.csv" hash="b50d2271da07991f17833bdac53ee71e"/><file name="Dhl_Postpay.csv" hash="5c803ebc2d02c6272b6b7b05951faba6"/><file name="Dhl_MeinPaketCommon.csv" hash="c7b3ed7c2c3d6b24a9bd66925658a439"/></dir></dir></dir></target><target name="mageskin"><dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="meinpaket"><dir name="images"><file name="dhl_checkout_button.png" hash="0b896fdfbd23d33a029f9c3e60757f1c"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="meinpaketcommon"><dir name="images"><file name="1.png" hash="3c2c9a82eb1ba846ba83fff02a7fb89d"/><file name="2.png" hash="ebbbb39b16a74905e9089014dadf27bb"/><file name="3.png" hash="4db863bc8404ba77b12b318d7932ca3d"/><file name="ayn_ger_tuete_produkte_aussen.jpg" hash="18acc68e20f2bc7e9417bb04cb64e2c5"/><file name="dhl_logo_kl.gif" hash="43fdd8c3b923355fdd27070feca49dc7"/><file name="loader.gif" hash="823d2e0f3345c88e9463a38a9c360817"/><file name="shadowtopbg.png" hash="9e274a269dcbe50256d1be49a192a9cd"/></dir><file name="module.css" hash="d477570fa7a981d64d2fdc79af098999"/><file name="module.js" hash="60aec009320033b3c786784934d5cdb2"/></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>DHL_Allyouneed</name>
4
+ <version>2.4.0</version>
5
  <stability>stable</stability>
6
  <license>--</license>
7
  <channel>community</channel>
10
  <description>The Extension connects your Magento shop with DHL Allyouneed.</description>
11
  <notes>--</notes>
12
  <authors><author><name>DHL Vertriebs GmbH</name><user>ybmdeutschland</user><email>support@meinpaket.de</email></author></authors>
13
+ <date>2015-10-08</date>
14
+ <time>13:40:15</time>
15
+ <contents><target name="magecommunity"><dir><dir name="Dhl"><dir name="MeinPaket"><dir><dir name="Block"><dir name="Adminhtml"><dir name="Backlog"><dir name="Product"><file name="Grid.php" hash="7541700fffd1811943ce7d1d5f1ecdaf"/></dir><file name="Product.php" hash="d0fa6e92c7a2349cb2ef578eb1dad702"/></dir><dir name="BestPrice"><file name="Grid.php" hash="adb8a1085e086f3d1dc57a489619ff5d"/></dir><file name="BestPrice.php" hash="b4f9912d464830a48fd5154c45b0c040"/><dir name="Catalog"><dir name="Product"><dir name="Matching"><file name="Result.php" hash="135446bcf25b60bb017e29b15881daa8"/><file name="Tab.php" hash="3d5c316f511ca64dfa511f04ac4b4a14"/></dir></dir></dir><dir name="CategoryImport"><file name="Import.php" hash="47f0969b175e1480efe8a97480c169da"/><file name="Index.php" hash="745b3c71e101599fbba7a7fd275362c9"/></dir><file name="LeftMenu.php" hash="b60dea4f9e9a39b663cab89be8e32b97"/><dir name="OrderImport"><file name="Index.php" hash="b45724d6ff1fcda6102b3147f3a66a94"/></dir><dir name="ProductExport"><file name="Export.php" hash="ba11e432eafe4d98693284229bcf16e7"/><file name="Index.php" hash="65cf2306ad93f387f525ec66cec1abee"/><file name="List.php" hash="4a32ced740d35ebb7a10d0fffa782223"/></dir><file name="Steps.php" hash="ffb3f688b43cd0c1f457b89c84e68b7f"/><file name="Version.php" hash="476febd9f5d12ac999bdc7a6d646fe20"/></dir></dir><dir name="Helper"><file name="Attribute.php" hash="36cf44cf54204426e3f50864381a6443"/><file name="Backlog.php" hash="51c08b4ef137799d0e7dbf900543ab3e"/><file name="Cron.php" hash="b320de066adaec731a4ce5d77397a1e8"/><file name="Data.php" hash="da9a067e866242802d77e67b8e319358"/><file name="Order.php" hash="e3dca5761fa8e5e4171a9712b14b5c30"/><file name="Product.php" hash="7cec9f2bcc86efddc8d4e8055fe625ea"/><file name="Shipment.php" hash="c8764cf370aded8e4d3c55e8c218a879"/></dir><dir name="Model"><dir name="Attribute"><file name="Mapping.php" hash="7d8a8d9e18f7c6019ae71a7032061ab7"/></dir><dir name="Backlog"><file name="Product.php" hash="a2d547dcfba28c80819155a73ff5cff4"/></dir><file name="BestPrice.php" hash="b75de965445df6125e115d0d89add52c"/><file name="Category.php" hash="d0f5804e7900915f1c03364b079a7dc5"/><file name="Cron.php" hash="6f418837cc6e452eb8470864f6d4b396"/><dir name="Entity"><dir name="Attribute"><dir name="Frontend"><file name="LabelTranslation.php" hash="7f4b3b49b6e12dadd768aee95e041579"/></dir><dir name="Source"><file name="Carrier.php" hash="65770c58617deb2dce75d8e83e055d79"/><file name="MeinPaketCategory.php" hash="17f784c2d79bfd847dd6472dca661334"/><file name="ProductAttribute.php" hash="aba17fe2a9acb85d0483926c3d5ba9a8"/><file name="ProductSyncMode.php" hash="39db6c156e9100ab59384756ec9ac2c5"/><file name="Taxclass.php" hash="696e7dda6d0bd21eeceb61adc0121cd6"/><file name="Taxrate.php" hash="40bbb2336441fa02916ab992279961e8"/></dir></dir></dir><dir name="Exception"><file name="InvalidDataException.php" hash="dcbfbe06f3d0190d5f4a9f0b47973bf2"/><file name="MissingDataException.php" hash="377d6cc783aa6e8973728a77e1e5b8a9"/></dir><dir name="Mysql4"><dir name="Backlog"><dir name="Product"><file name="Collection.php" hash="2711f602d90e22ea72b773003cf38ef4"/></dir><file name="Product.php" hash="d46057bf2e8b93b32b23653222599316"/></dir><dir name="BestPrice"><file name="Collection.php" hash="fedcad4595269a646ff1c452bed87b00"/></dir><file name="BestPrice.php" hash="79399000e407b6a22489d0dbfedd6f34"/><dir name="Category"><file name="Collection.php" hash="06fd9a509c1ef252c0b75f6acda1b9eb"/></dir><file name="Category.php" hash="449c4f90fe5e797ca587025c63c745c3"/></dir><file name="Observer.php" hash="f24372a506e25cdc15ea96ec4eb0d3a4"/><dir name="Payment"><dir name="Method"><file name="Meinpaket.php" hash="dcb6ac810be4d0bb9e426464be91610d"/></dir></dir><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="6a8952042b65c89685e24b3b503c0d67"/></dir></dir></dir><dir name="Service"><dir name="MarketplaceCategoryImport"><file name="ImportService.php" hash="bf0c889ce83b0afe084c20f97288370e"/><file name="Result.php" hash="cdebaf351ccd1c7aa285801701d32e7f"/></dir><dir name="Product"><dir name="Export"><dir name="Exception"><file name="InvalidEan.php" hash="bc88e3bc48a8a96e45079054290ae68c"/></dir></dir><file name="Export.php" hash="6981381700d186d943957c49d1e1965e"/></dir><dir name="ProductData"><file name="RequestService.php" hash="381ffeb30499242407bbf88d1eb82141"/></dir><dir name="Result"><file name="Abstract.php" hash="c7d84905431b651779dc1011f246983b"/><file name="Upload.php" hash="4ddf194a126ce18938610f61fcc1260d"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Attributes.php" hash="e6cd11540ebf6bc87f4d949d81285703"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Backlog"><file name="ProductController.php" hash="044e311e2b1f66e67f8f2f7324b26707"/></dir><file name="BestPriceController.php" hash="7c246fb0174072ba7a34476e0b3f4fe9"/><file name="CategoryImportController.php" hash="aa451cc2c30d4f8bb6c65a84dd473236"/><file name="MatchingController.php" hash="ff50f09fb0ca13cf9d4f822fea573d0b"/><file name="ProductExportController.php" hash="3dbe834e4dff03bb3abc2674e022f4e6"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="0f5199337bb69d97a435e5bbf35943f0"/><file name="config.xml" hash="e590da33738b175c612df862093dcc39"/><file name="system.xml" hash="381fa94cf8cef54db494eea83f26dff1"/></dir><dir name="sql"><dir name="meinpaket_setup"><file name="mysql4-install-1.0.0.php" hash="f517a9fbaa8e58738d67fc146f493496"/><file name="mysql4-upgrade-1.0.0-1.1.0.php" hash="b52cd860cbc35cff0f704a033b296cdf"/><file name="mysql4-upgrade-1.1.0-2.0.0.php" hash="199b74750e105a4e215bb268dceeb897"/><file name="mysql4-upgrade-2.1.0-2.2.0.php" hash="2312e1c6c3d2c254383b0f0e163cd243"/></dir></dir></dir></dir><dir name="Postpay"><dir><dir name="Block"><dir name="Adminhtml"><file name="Version.php" hash="887b1a63cd09847ba7ab3392bd4f9602"/></dir><file name="Checkout.php" hash="ec8b0f2764d863f03dec0167617510a6"/><dir name="Payment"><dir name="Form"><file name="Standard.php" hash="6aca4f231c317c45ac1556d39639d84f"/></dir><dir name="Info"><file name="Standard.php" hash="45252ddc1f9ebb332ef75efa5f868432"/></dir></dir></dir><dir name="Helper"><file name="Cron.php" hash="c2391d5d085c31f2650655e8acdbfb97"/><file name="Data.php" hash="418df17f5f760dc47bba8bb815d77c58"/></dir><dir name="Model"><file name="Cart.php" hash="e599a64fec791a587552a020b563b426"/><file name="Cron.php" hash="7f563b1e5fabd6534a72ad8239af341d"/><dir name="Mysql4"><dir name="Cart"><file name="Collection.php" hash="3b5150eb69a37a738e3f8494db0f4af1"/></dir><file name="Cart.php" hash="74042698f6fb9f2c7ca054d17f1ff0a2"/></dir><file name="Observer.php" hash="8a9eb2111c0a450e460f10e2b2a721eb"/><dir name="Payment"><dir name="Method"><file name="Express.php" hash="91259cee6e39f7c993a823edbaab4817"/><file name="Standard.php" hash="30d139303e4f80c1ed8c03397666c890"/></dir></dir><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="ac36d5a7a1988eab4dad69efd472c50f"/></dir></dir></dir><dir name="Service"><dir name="Order"><file name="ImportService.php" hash="60c7e7a116d65b2bb3a1e15f03860558"/></dir></dir></dir><dir name="controllers"><file name="CheckoutController.php" hash="7a0801e7c03be05beb8c38004dea1464"/><file name="NotificationController.php" hash="41a608eddf5b891ca0b26b1ef1323691"/><file name="ResponseController.php" hash="79cb81c28fe2460fac0be802a8b598b2"/></dir><dir name="etc"><file name="config.xml" hash="03ec5091a924c490954cbfdb0a8ea8df"/><file name="system.xml" hash="43de1564100406a0cfcf69096f89b41a"/></dir><dir name="sql"><dir name="postpay_setup"><file name="mysql4-install-1.0.0.php" hash="8a5f877376e1df9b1a8bde8d4ce70158"/></dir></dir></dir></dir><dir name="MeinPaketCommon"><dir><dir name="Block"><dir name="Adminhtml"><dir name="Async"><file name="Grid.php" hash="dbf8ebeac3b98728c3cef8785c83c897"/></dir><file name="Async.php" hash="7169a4ea405f54ae1d6da4c56c302fcc"/><dir name="Log"><file name="Grid.php" hash="5d689a4f204c8cade2b6d2a97b1fe0e6"/></dir><file name="Log.php" hash="36a68e5de0cf7dfb87e3b090c05c1e9c"/><file name="Version.php" hash="28defa5c89727f8c3a877affb55d0443"/></dir></dir><dir name="Helper"><file name="Address.php" hash="def05195630f6f98802481d228b4f25e"/><file name="Attribute.php" hash="905db640dbe49889e273aeb7415b2441"/><file name="Cron.php" hash="023eb7080558ebd43af77c1846a44534"/><file name="Data.php" hash="4f97cc684778b9fe75003c71d86192f8"/><file name="Order.php" hash="736798b03eefd167e60854ad2e07792b"/><file name="Product.php" hash="64b549bcf8210028cd6f5af4063c8486"/><file name="Shipment.php" hash="4f62b24147d2998762ca74975e4cc379"/></dir><dir name="Model"><file name="Async.php" hash="3112120abd4ff2773dbcf19dedfd4044"/><dir name="Carrier"><file name="Allyouneed.php" hash="25eaf021d05a89e988c9370f25fd56cf"/><file name="Meinpaket.php" hash="b16814df68414d1fb6e795eadc4d6e83"/></dir><dir name="Client"><file name="BadHttpReturnCodeException.php" hash="3f3d67278be542e42bb882f387c04b67"/><file name="HttpException.php" hash="963bc4b8d30d2996a2a08b4c8aaa6b8f"/><file name="HttpTimeoutException.php" hash="d633742d26c8c5438543c1bbdf5c09bd"/><file name="XmlOverHttp.php" hash="f440d7016304ae65d17f6cdb79fc7c5c"/></dir><file name="Cron.php" hash="35c06419c8aa9c6413f8304fda80c3ff"/><dir name="Entity"><dir name="Attribute"><dir name="Source"><file name="Carrier.php" hash="437c70fc9b4e8fa719bdd19676bbbacf"/></dir></dir></dir><dir name="Exception"><file name="InvalidDataException.php" hash="808caf989c24f1146d47fc610be6e131"/><file name="MissingDataException.php" hash="67a06069dcb66c02235f636b6790a62d"/></dir><file name="Log.php" hash="516fc34067f4573d160100d7a975a66c"/><dir name="Mysql4"><dir name="Async"><file name="Collection.php" hash="d5f6fbe4a4be75181844eddfbbd557cf"/></dir><file name="Async.php" hash="2120d8c0411c8773853cee4c5925467a"/><dir name="Log"><file name="Collection.php" hash="9bba87a636029d675e1ceda42f96dbc4"/></dir><file name="Log.php" hash="a09be611512f4dc95880e6e00dab93ca"/></dir><file name="Observer.php" hash="15812db421a573332a95f35e9acb9be9"/><dir name="Payment"><dir name="Method"><file name="Allyouneed.php" hash="663bf3c0f796e41a36eed0c277c0af42"/><file name="Meinpaket.php" hash="fdbc24e8330ecbb71243e1f4b5b83bc3"/></dir></dir><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="ce3a02f9c90e0a1f04a6202305c72ff4"/></dir></dir></dir><dir name="Service"><file name="Abstract.php" hash="406fb92c370df8e93aaffacbad56937b"/><file name="Async.php" hash="5dba3892bc2b78846f2ca7593385a1bc"/><dir name="Order"><dir name="CancellationService"><file name="Result.php" hash="fd81666a5855ea6b25904e14d498ea20"/></dir><file name="CancellationService.php" hash="a6806a3531b596a729a418688ba51dcc"/><file name="ImportService.php" hash="d8f63edb5939a479b8b5f359b23944b9"/><dir name="RefundExportService"><file name="Result.php" hash="dcfd1f479709368b446041674ee445d8"/></dir><file name="RefundExportService.php" hash="7ab8222a77e76517247f7f710d60b590"/><dir name="ShipmentExportService"><file name="Result.php" hash="0ba713e725c87d0bc82321582e3fe776"/></dir><file name="ShipmentExportService.php" hash="3045ed7ffb7f6a1f4c592e49832577f9"/></dir><dir name="Result"><file name="Abstract.php" hash="c7d84905431b651779dc1011f246983b"/><file name="Upload.php" hash="51438929f66a7efe3541511b6966ea09"/></dir></dir><dir name="System"><file name="MemoryLimiter.php" hash="813d89b8c21834fb911acc8e59be950c"/></dir><dir name="Validation"><file name="ValidationInterface.php" hash="d11950e6d4a7b52e3784867e8d8d2230"/><dir name="Validator"><file name="CDATAContent.php" hash="425678e9cf44efee9d884c20e4db1f14"/><file name="Ean.php" hash="7bab4c07ebcbdf3ce9e087ff20976d1a"/><file name="IntGreaterZero.php" hash="682c11f5cf24cafcef61350194a65be1"/><file name="NonEmptyString.php" hash="7075a72eace8e1f8c5bc5b61a5a25231"/><file name="StringMaxLength.php" hash="c19f729ff39b5b6b438635fe9bd9c6bf"/><file name="Url.php" hash="7b1f83a803fd8788ad4b22aaa982d04f"/></dir><file name="ValidatorChain.php" hash="72148d630805652276c446ebef817f47"/><file name="ValidatorInterface.php" hash="df41d71f7970d758b18bf36c2e49f6f1"/></dir><dir name="Xml"><file name="AbstractXmlPartial.php" hash="303a1e75e4ba719683f09ea9a5cc2743"/><file name="AbstractXmlRequest.php" hash="9a72dc1e6fe6cc1f027d1f339e6bc0f4"/><file name="InvalidXmlException.php" hash="22c021f43b7df35045814cd1ca714968"/><dir name="Request"><file name="AsynchronousStatusRequest.php" hash="4b17665dfef64f23d366f671a06634e3"/><file name="DataRequest.php" hash="c841bd02a2d20c01fa27315397717ba7"/><file name="DownloadRequest.php" hash="05e941a0db71e679d5e3bce00bd5da8d"/><file name="NotificationRequest.php" hash="2902af863aaa33df93cc6e8cfdbf4b8c"/><file name="QueryRequest.php" hash="31746798830da6d1a5909e9f6761e5e1"/><file name="SubmitCartRequest.php" hash="bda8ba8a1662b59e49ddb974219cacf4"/><file name="UploadRequest.php" hash="0f43ff9cb25661ef75609a485f7a4939"/></dir><dir name="Response"><file name="Abstract.php" hash="f7e963bf5586d26347c4d1a6887a4b79"/><file name="AsynchronousStatusResponse.php" hash="6571d1b3093cd73e7eda7ff940df4453"/><file name="DataResponse.php" hash="672c55dd8e770219eac74214726cb5ef"/><file name="DownloadResponse.php" hash="831f43cece257d44fe65d02304362a8c"/><file name="NotificationResponse.php" hash="be7626da7ef2f744f183228110aabbea"/><dir name="Partial"><file name="Address.php" hash="d9ea71d56eb49fe3a512edd412293922"/><file name="Attribute.php" hash="4c27a169c0c773afde7502d6704ee372"/><file name="Category.php" hash="2b040bd3b89121ba28fef0ae07915915"/><file name="CategoryId.php" hash="09f6b3ecf29c4d3a16d37978efd53b4a"/><dir name="DataResponse"><file name="BestPrice.php" hash="e545a040a9201c3c8a71d4b410dcfc4d"/><file name="Confirmation.php" hash="b93b06d18277c10899535d91c1b71829"/><file name="MerchantData.php" hash="f03d2b35691c4356c43251e3c1c1fd20"/><file name="ProductData.php" hash="ab11140f6a0c4556a558d317651db82b"/><file name="QuotaData.php" hash="feb7180ff8c332decc938c1394ab8018"/></dir><dir name="NotificationResponse"><file name="Confirmation.php" hash="62225a96f3c9ce1047afc3f2c04b44ea"/><file name="Consignment.php" hash="20cb98f68cb94033d7abc5cb29ba47a4"/><file name="Credit.php" hash="7dfa1b551c938bbdbcab3e7f5ca4a86e"/><file name="Return.php" hash="d2538c678241727e3fe996d800da75b1"/></dir><dir name="Order"><file name="ContactData.php" hash="27cd1f6a5f8125352f3c383ab40e18af"/><file name="Entry.php" hash="f925387971c3a4e90bf3a66735f78025"/></dir><file name="Order.php" hash="470ed2a1671600318de784fedc34dbb9"/><file name="ProductId.php" hash="098e038cb611d92a65aa8a305567a2d0"/><file name="VariantConfiguration.php" hash="c3840d3e11cc2cc2c50d1f4f03bca963"/></dir><file name="QueryResponse.php" hash="300bfcfdb7f52380b207b45fede50e8e"/><file name="SubmitCartResponse.php" hash="82743d5832c4a12675796bbbde6f72e0"/><file name="UploadResponse.php" hash="72febd4c94809063f0df96bd32eb0c97"/></dir><file name="XmlBuildException.php" hash="72ee8a17dab2c457bb821cd36bbff689"/><file name="XmlResponseParser.php" hash="94502547e6f7495e708652f72155c020"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="AsyncController.php" hash="5289ad7eeea143238d1c273cf2e83e34"/><file name="LogController.php" hash="f1642d5954656247bb30d71e671d37ba"/><file name="OrderImportController.php" hash="48fb94a275992162063bac34626b681e"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="f627a6fe1d4f783b5e81cf183baaffe6"/><file name="config.xml" hash="72a0800a7e1562ff209d9ffe124dd66d"/><file name="system.xml" hash="e6e194ead56359c8c3dfad7f2005bec9"/></dir><dir name="sql"><dir name="meinpaketcommon_setup"><file name="mysql4-install-1.0.0.php" hash="619358ad78ac3123511e8d77f11dc39f"/><file name="mysql4-upgrade-1.0.0-1.1.0.php" hash="f44902d977f8aca8e25fd3f716b6d9ab"/><file name="mysql4-upgrade-1.1.1-1.2.0.php" hash="55ef95a239ccc835f3a4cc2de9ae9c5a"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="Dhl_MeinPaket.xml" hash="b2ab0b71945c9849bbabe9cac0280beb"/><file name="Dhl_Postpay.xml" hash="26852f055604828ffca341f7437db998"/><file name="Dhl_MeinPaketCommon.xml" hash="b926a30bca6162be2a951f9fb0f62e00"/></dir></dir></target><target name="mage"><dir><dir name="shell"><file name="dhlmeinpaket-category-import.php" hash="b7c47a9b557e7fae4c5309ed95628ab6"/><file name="dhlmeinpaket-product-export.php" hash="9cfb888cdec7047a488fd68e84f5c495"/><file name="dhlmeinpaket-request-bestprice.php" hash="8bbcdd8eb442861f7e94d44b8db99226"/><file name="dhlmeinpaket-order-import.php" hash="7ff812c3c5dbb27d88554946c7e1edab"/></dir></dir></target><target name="magedesign"><dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="meinpaket.xml" hash="3854556688b7e27a8e7eda0cdf2b6610"/><file name="postpay.xml" hash="890708f41152cb5326040006a0d13bf1"/><file name="meinpaketcommon.xml" hash="3854556688b7e27a8e7eda0cdf2b6610"/></dir><dir name="template"><dir name="postpay"><dir><dir name="checkout"><file name="image.phtml" hash="9283259a1e502907c0ba1c659f4ffe1b"/></dir><dir name="payment"><file name="redirect.phtml" hash="4d6e571020670c2069a2323b54f707ea"/></dir></dir><file name="checkout.phtml" hash="424e3ad9ab6f20dba21412ed9de315e6"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="meinpaket.xml" hash="973b9b6f616f8da3528ab68cc379819c"/><file name="postpay.xml" hash="5bef4c0511b6e60ed9abf1503849809e"/><file name="meinpaketcommon.xml" hash="4563e3cf8fc469dcecf1c8ff88e26cf7"/></dir><dir name="template"><dir name="meinpaket"><dir><dir name="catalog"><dir name="product"><dir name="matching"><file name="result.phtml" hash="fcc1b10a90944f5657e7c39bda175d44"/><file name="tab.phtml" hash="143d3ef87d9f351b1f578d66354671d6"/></dir></dir></dir><dir name="category"><dir name="import"><file name="import.phtml" hash="d749033dde8fe39bc006d9ac2c458ef1"/><file name="index.phtml" hash="cd832201909c7cbfb76f165fe29c0f03"/></dir></dir></dir><file name="leftmenu.phtml" hash="4afb8d200ed8ceddf2f682c5911c565c"/><file name="steps.phtml" hash="70a343086b4559dc0e77173d9a799e39"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir><dir name="de_DE"><file name="Dhl_MeinPaket.csv" hash="b50d2271da07991f17833bdac53ee71e"/><file name="Dhl_Postpay.csv" hash="5c803ebc2d02c6272b6b7b05951faba6"/><file name="Dhl_MeinPaketCommon.csv" hash="c7b3ed7c2c3d6b24a9bd66925658a439"/></dir></dir></dir></target><target name="mageskin"><dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="meinpaketcommon"><dir name="images"><file name="1.png" hash="3c2c9a82eb1ba846ba83fff02a7fb89d"/><file name="2.png" hash="ebbbb39b16a74905e9089014dadf27bb"/><file name="3.png" hash="4db863bc8404ba77b12b318d7932ca3d"/><file name="ayn_ger_tuete_produkte_aussen.jpg" hash="18acc68e20f2bc7e9417bb04cb64e2c5"/><file name="dhl_logo_kl.gif" hash="43fdd8c3b923355fdd27070feca49dc7"/><file name="loader.gif" hash="823d2e0f3345c88e9463a38a9c360817"/><file name="shadowtopbg.png" hash="9e274a269dcbe50256d1be49a192a9cd"/></dir><file name="module.css" hash="d477570fa7a981d64d2fdc79af098999"/><file name="module.js" hash="60aec009320033b3c786784934d5cdb2"/></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
skin/frontend/default/default/meinpaket/images/dhl_checkout_button.png DELETED
Binary file