DHL_MeinPaket2 - Version 2.4.0

Version Notes

--

Download this release

Release Info

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


Code changes from version 2.0.16 to 2.4.0

Files changed (84) hide show
  1. app/code/community/Dhl/MeinPaket/Block/Adminhtml/Catalog/Product/Matching/Tab.php +2 -2
  2. app/code/community/Dhl/MeinPaket/Block/Adminhtml/ProductExport/Export.php +1 -1
  3. app/code/community/Dhl/MeinPaket/Block/Adminhtml/Version.php +6 -0
  4. app/code/community/Dhl/MeinPaket/Helper/Data.php +12 -53
  5. app/code/community/Dhl/MeinPaket/Helper/Order.php +1 -1
  6. app/code/community/Dhl/MeinPaket/Helper/Product.php +18 -8
  7. app/code/community/Dhl/MeinPaket/Helper/Shipment.php +1 -1
  8. app/code/community/Dhl/MeinPaket/Model/Cron.php +1 -1
  9. app/code/community/Dhl/MeinPaket/Model/Mysql4/Category.php +1 -1
  10. app/code/community/Dhl/MeinPaket/Model/Mysql4/Category/Collection.php +1 -1
  11. app/code/community/Dhl/MeinPaket/Model/Observer.php +6 -7
  12. app/code/community/Dhl/MeinPaket/Model/Payment/Method/Meinpaket.php +1 -1
  13. app/code/community/Dhl/MeinPaket/Model/Resource/Eav/Mysql4/Setup.php +0 -56
  14. app/code/community/Dhl/MeinPaket/Model/Service/MarketplaceCategoryImport/Result.php +1 -1
  15. app/code/community/Dhl/MeinPaket/Model/Service/Product/Export.php +27 -13
  16. app/code/community/Dhl/MeinPaket/Model/Service/ProductData/RequestService.php +5 -5
  17. app/code/community/Dhl/MeinPaket/controllers/Adminhtml/Backlog/ProductController.php +8 -0
  18. app/code/community/Dhl/MeinPaket/controllers/Adminhtml/BestPriceController.php +8 -0
  19. app/code/community/Dhl/MeinPaket/controllers/Adminhtml/CategoryImportController.php +12 -4
  20. app/code/community/Dhl/MeinPaket/controllers/Adminhtml/MatchingController.php +9 -0
  21. app/code/community/Dhl/MeinPaket/controllers/Adminhtml/ProductExportController.php +17 -8
  22. app/code/community/Dhl/MeinPaket/etc/adminhtml.xml +33 -8
  23. app/code/community/Dhl/MeinPaket/etc/config.xml +1 -1
  24. app/code/community/Dhl/MeinPaket/etc/system.xml +15 -15
  25. app/code/community/Dhl/MeinPaket/sql/meinpaket_setup/mysql4-install-1.0.0.php +0 -16
  26. app/code/community/Dhl/MeinPaket/sql/meinpaket_setup/mysql4-upgrade-1.0.0-1.1.0.php +0 -2
  27. app/code/community/Dhl/MeinPaket/sql/meinpaket_setup/mysql4-upgrade-1.1.0-2.0.0.php +4 -6
  28. app/code/community/Dhl/MeinPaket/sql/meinpaket_setup/mysql4-upgrade-2.1.0-2.2.0.php +50 -0
  29. app/code/community/Dhl/MeinPaketCommon/Block/Adminhtml/Log/Grid.php +5 -0
  30. app/code/community/Dhl/MeinPaketCommon/Block/Adminhtml/Version.php +6 -0
  31. app/code/community/Dhl/MeinPaketCommon/Helper/Data.php +20 -70
  32. app/code/community/Dhl/MeinPaketCommon/Helper/Order.php +1 -1
  33. app/code/community/Dhl/MeinPaketCommon/Helper/Product.php +44 -10
  34. app/code/community/Dhl/MeinPaketCommon/Helper/Shipment.php +1 -1
  35. app/code/community/Dhl/MeinPaketCommon/Model/Carrier/Allyouneed.php +111 -0
  36. app/code/community/Dhl/MeinPaketCommon/Model/Carrier/Meinpaket.php +12 -0
  37. app/code/community/Dhl/MeinPaketCommon/Model/Client/XmlOverHttp.php +6 -4
  38. app/code/community/Dhl/MeinPaketCommon/Model/Cron.php +2 -2
  39. app/code/community/Dhl/MeinPaketCommon/Model/Observer.php +39 -39
  40. app/code/community/Dhl/MeinPaketCommon/Model/Payment/Method/Allyouneed.php +29 -0
  41. app/code/community/Dhl/MeinPaketCommon/Model/Resource/Eav/Mysql4/Setup.php +0 -50
  42. app/code/community/Dhl/MeinPaketCommon/Model/Service/Order/CancellationService/Result.php +2 -2
  43. app/code/community/Dhl/MeinPaketCommon/Model/Service/Order/ImportService.php +77 -29
  44. app/code/community/Dhl/MeinPaketCommon/Model/Service/Order/RefundExportService.php +2 -2
  45. app/code/community/Dhl/MeinPaketCommon/Model/Service/Order/RefundExportService/Result.php +1 -1
  46. app/code/community/Dhl/MeinPaketCommon/Model/Service/Order/ShipmentExportService.php +3 -3
  47. app/code/community/Dhl/MeinPaketCommon/Model/Service/Order/ShipmentExportService/Result.php +2 -2
  48. app/code/community/Dhl/MeinPaketCommon/Model/Xml/AbstractXmlRequest.php +2 -2
  49. app/code/community/Dhl/MeinPaketCommon/Model/Xml/Request/DataRequest.php +1 -1
  50. app/code/community/Dhl/MeinPaketCommon/Model/Xml/Request/UploadRequest.php +64 -31
  51. app/code/community/Dhl/MeinPaketCommon/Model/Xml/Response/UploadResponse.php +3 -3
  52. app/code/community/Dhl/MeinPaketCommon/controllers/Adminhtml/AsyncController.php +8 -0
  53. app/code/community/Dhl/MeinPaketCommon/controllers/Adminhtml/LogController.php +8 -0
  54. app/code/community/Dhl/MeinPaketCommon/controllers/Adminhtml/OrderImportController.php +12 -4
  55. app/code/community/Dhl/MeinPaketCommon/etc/adminhtml.xml +23 -6
  56. app/code/community/Dhl/MeinPaketCommon/etc/config.xml +21 -3
  57. app/code/community/Dhl/MeinPaketCommon/etc/system.xml +31 -22
  58. app/code/community/Dhl/MeinPaketCommon/sql/meinpaketcommon_setup/mysql4-install-1.0.0.php +4 -6
  59. app/code/community/Dhl/MeinPaketCommon/sql/meinpaketcommon_setup/mysql4-upgrade-1.0.0-1.1.0.php +33 -0
  60. app/code/community/Dhl/MeinPaketCommon/sql/meinpaketcommon_setup/mysql4-upgrade-1.1.1-1.2.0.php +11 -0
  61. app/code/community/Dhl/Postpay/Block/Adminhtml/Version.php +6 -0
  62. app/code/community/Dhl/Postpay/Model/Cron.php +1 -1
  63. app/code/community/Dhl/Postpay/Model/Observer.php +1 -1
  64. app/code/community/Dhl/Postpay/Model/Resource/Eav/Mysql4/Setup.php +0 -7
  65. app/code/community/Dhl/Postpay/Model/Service/Order/ImportService.php +1 -1
  66. app/code/community/Dhl/Postpay/etc/config.xml +1 -1
  67. app/code/community/Dhl/Postpay/sql/postpay_setup/mysql4-install-1.0.0.php +1 -3
  68. app/design/adminhtml/default/default/template/meinpaket/catalog/product/matching/tab.phtml +3 -1
  69. app/design/adminhtml/default/default/template/meinpaket/category/import/import.phtml +6 -6
  70. app/design/adminhtml/default/default/template/meinpaket/category/import/index.phtml +17 -15
  71. app/design/adminhtml/default/default/template/meinpaket/steps.phtml +1 -1
  72. app/locale/de_DE/Dhl_MeinPaket.csv +78 -173
  73. app/locale/de_DE/Dhl_MeinPaketCommon.csv +43 -161
  74. app/locale/de_DE/Dhl_Postpay.csv +0 -181
  75. package.xml +7 -7
  76. shell/dhlmeinpaket-category-import.php +2 -2
  77. shell/dhlmeinpaket-order-import.php +2 -2
  78. shell/dhlmeinpaket-product-export.php +2 -2
  79. shell/dhlmeinpaket-request-bestprice.php +2 -2
  80. skin/adminhtml/default/default/meinpaketcommon/images/ayn_ger_tuete_produkte_aussen.jpg +0 -0
  81. skin/adminhtml/default/default/meinpaketcommon/images/meinpaket_logo.png +0 -0
  82. skin/adminhtml/default/default/meinpaketcommon/module.css +29 -23
  83. skin/adminhtml/default/default/meinpaketcommon/module.js +5 -6
  84. skin/frontend/default/default/meinpaket/images/dhl_checkout_button.png +0 -0
app/code/community/Dhl/MeinPaket/Block/Adminhtml/Catalog/Product/Matching/Tab.php CHANGED
@@ -23,7 +23,7 @@ class Dhl_MeinPaket_Block_Adminhtml_Catalog_Product_Matching_Tab extends Mage_Ad
23
  * @return string
24
  */
25
  public function getTabLabel() {
26
- return $this->__ ( 'DHL Meinpaket Matching' );
27
  }
28
 
29
  /**
@@ -32,7 +32,7 @@ class Dhl_MeinPaket_Block_Adminhtml_Catalog_Product_Matching_Tab extends Mage_Ad
32
  * @return string
33
  */
34
  public function getTabTitle() {
35
- return $this->__ ( 'Assign DHL Meinpaket Category' );
36
  }
37
 
38
  /**
23
  * @return string
24
  */
25
  public function getTabLabel() {
26
+ return $this->__ ( 'Allyouneed Matching' );
27
  }
28
 
29
  /**
32
  * @return string
33
  */
34
  public function getTabTitle() {
35
+ return $this->__ ( 'Assign Allyouneed Category' );
36
  }
37
 
38
  /**
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/Block/Adminhtml/Version.php ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
1
+ <?php
2
+ class Dhl_MeinPaket_Block_Adminhtml_Version extends Mage_Adminhtml_Block_System_Config_Form_Field {
3
+ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) {
4
+ return ( string ) Mage::helper ( 'meinpaket/data' )->getExtensionVersion ();
5
+ }
6
+ }
app/code/community/Dhl/MeinPaket/Helper/Data.php CHANGED
@@ -8,62 +8,12 @@
8
  * @subpackage Helper
9
  */
10
  class Dhl_MeinPaket_Helper_Data extends Mage_Core_Helper_Abstract {
11
- /**
12
- * Creates/extends JavaScript language object by the given labels.
13
- * The given labels array must have the structure array('key1'=>'label1','key2'=>'label2',...).
14
- * Key is the key under which the label will be accessible in frontend JavaScript.
15
- * Label is the untranslated label.
16
- * Example: Element is 'foo'=>'Bar'. So use MeinPaket.locale.foo .
17
- *
18
- * @param array $labels
19
- * @return string
20
- */
21
- public function createLocaleJS(array $labels) {
22
- $js = 'if(typeof MeinPaket === "undefined"){var MeinPaket={};}';
23
- $js .= 'if(typeof MeinPaket.locale === "undefined"){MeinPaket.locale={};}';
24
- $js .= 'Object.extend(MeinPaket.locale,{';
25
-
26
- $firstItem = true;
27
- if (sizeof ( $labels ) > 0) {
28
- foreach ( $labels as $key => $label ) {
29
- $js .= $this->_addJSLocaleLabel ( $key, $this->__ ( $label ), $firstItem );
30
- if ($firstItem) {
31
- $firstItem = false;
32
- }
33
- }
34
- }
35
-
36
- $js .= '});';
37
-
38
- return $js;
39
- }
40
-
41
- /**
42
- * Creates a json property.
43
- *
44
- * @param string $key
45
- * @param string $label
46
- * @param boolean $isFirst
47
- * Tells if the label is the first in the list.
48
- * @return string
49
- */
50
- protected function _addJSLocaleLabel($key, $label, $isFirst = false) {
51
- $labelProperty = '';
52
-
53
- if (! $isFirst) {
54
- $labelProperty .= ',';
55
- }
56
-
57
- $labelProperty .= $key . ':"' . $label . '"';
58
-
59
- return $labelProperty;
60
- }
61
- public function getExtensionVersion() {
62
- return ( string ) Mage::getConfig ()->getModuleConfig ( 'Dhl_MeinPaket' )->version;
63
- }
64
  const STORE_VIEW_CONFIG = 'meinpaket/store/view';
65
  private $_meinpaketStore = null;
66
  private $_meinpaketRootCategory = null;
 
 
 
67
  public function getMeinPaketStore() {
68
  if ($this->_meinpaketStore == null) {
69
  $this->_meinpaketStore = Mage::app ()->getStore ( Mage::getStoreConfig ( self::STORE_VIEW_CONFIG ) );
@@ -87,4 +37,13 @@ class Dhl_MeinPaket_Helper_Data extends Mage_Core_Helper_Abstract {
87
  }
88
  return $this->_meinpaketRootCategory;
89
  }
 
 
 
 
 
 
 
 
 
90
  }
8
  * @subpackage Helper
9
  */
10
  class Dhl_MeinPaket_Helper_Data extends Mage_Core_Helper_Abstract {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
11
  const STORE_VIEW_CONFIG = 'meinpaket/store/view';
12
  private $_meinpaketStore = null;
13
  private $_meinpaketRootCategory = null;
14
+ public function getExtensionVersion() {
15
+ return ( string ) Mage::getConfig ()->getModuleConfig ( 'Dhl_MeinPaket' )->version;
16
+ }
17
  public function getMeinPaketStore() {
18
  if ($this->_meinpaketStore == null) {
19
  $this->_meinpaketStore = Mage::app ()->getStore ( Mage::getStoreConfig ( self::STORE_VIEW_CONFIG ) );
37
  }
38
  return $this->_meinpaketRootCategory;
39
  }
40
+
41
+ /**
42
+ * Is this module active?
43
+ *
44
+ * @return bool
45
+ */
46
+ public function isActive() {
47
+ return ( bool ) Mage::getStoreConfigFlag ( 'meinpaket/credentials/active' );
48
+ }
49
  }
app/code/community/Dhl/MeinPaket/Helper/Order.php CHANGED
@@ -10,7 +10,7 @@
10
  */
11
  class Dhl_MeinPaket_Helper_Order extends Mage_Core_Helper_Abstract {
12
  /**
13
- * Tells if the given order is an order that was imported from MeinPaket.de.
14
  *
15
  * @param Mage_Sales_Model_Order $order
16
  * @return boolean
10
  */
11
  class Dhl_MeinPaket_Helper_Order extends Mage_Core_Helper_Abstract {
12
  /**
13
+ * Tells if the given order is an order that was imported from Allyouneed.
14
  *
15
  * @param Mage_Sales_Model_Order $order
16
  * @return boolean
app/code/community/Dhl/MeinPaket/Helper/Product.php CHANGED
@@ -33,6 +33,16 @@ class Dhl_MeinPaket_Helper_Product extends Mage_Core_Helper_Abstract {
33
  $this->_eanValidator = Mage::getSingleton ( 'meinpaketcommon/validation_validator_ean' );
34
  }
35
 
 
 
 
 
 
 
 
 
 
 
36
  /**
37
  * Tells if the given product has a valid ean.
38
  *
@@ -262,7 +272,7 @@ class Dhl_MeinPaket_Helper_Product extends Mage_Core_Helper_Abstract {
262
  if ($simpleProduct->getTypeId () === Mage_Catalog_Model_Product_Type::TYPE_SIMPLE) {
263
  $parentIds = Mage::getModel ( 'catalog/product_type_configurable' )->getParentIdsByChild ( $simpleProduct->getId () );
264
  if (isset ( $parentIds [0] )) {
265
- $parentConfigurable = Mage::getModel ( 'catalog/product' )->load ( $parentIds [0] );
266
  }
267
  }
268
 
@@ -287,22 +297,22 @@ class Dhl_MeinPaket_Helper_Product extends Mage_Core_Helper_Abstract {
287
  $description = $this->__ ( 'Missing value for field' ) . ' "<i><b>' . $this->__ ( $this->getLabelForFieldName ( $errorCode ) ) . '</b></i>".';
288
  break;
289
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_PRODUCT_NOT_EXISTS_IN_MEINPAKET :
290
- $description = $this->__ ( 'Product is unknown in MeinPaket marketplace' ) . '.';
291
  break;
292
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_PRODUCT_NEGATIVE_STOCK :
293
  $description = $this->__ ( 'Product stock is lower than zero.' );
294
  break;
295
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_MEINPAKET_SERVER_ERROR :
296
- $description = $this->__ ( 'Internal error on MeinPaket server' ) . '.';
297
  break;
298
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_NOT_AUTHORIZED :
299
- $description = $this->__ ( 'You are not authorized to execute the requested functionality on MeinPaket' );
300
  break;
301
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_INVALID_DATA :
302
  $description = $this->__ ( 'The provided data was incorrect' );
303
  break;
304
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_INVALID_MODIFICATION :
305
- $description = $this->__ ( 'Ivalid modification of element' );
306
  break;
307
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_NO_CATEGORIZATION :
308
  $description = $this->__ ( 'The product is not mapped to neither a marketplace nor a shop category' );
@@ -311,16 +321,16 @@ class Dhl_MeinPaket_Helper_Product extends Mage_Core_Helper_Abstract {
311
  $description = $this->__ ( 'The referenced product cannot be sold' );
312
  break;
313
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_MARKETPLACE_CATEGORY_NOT_FOUND :
314
- $description = $this->__ ( 'The referenced marketplace category could not be found at MeinPaket' );
315
  break;
316
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_SHOP_CATEGORY_NOT_FOUND :
317
- $description = $this->__ ( 'The referenced shop category could not be found at MeinPaket' );
318
  break;
319
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_MISSING_VALUE_FOR_ATTRIBUTE :
320
  $description = $this->__ ( 'Missing value mapping for attribute' ) . ' "' . $errorCode . '".';
321
  break;
322
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_VARIANT_GROUP_NOT_EXISTS :
323
- $description = $this->__ ( 'Variant group does not exist on MeinPaket' ) . ' "' . $errorCode . '".';
324
  break;
325
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_UNDEFINED :
326
  default :
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 to be checked
40
+ * @return boolean true if the product should be listed
41
+ */
42
+ public function isActive(Mage_Catalog_Model_Product $product) {
43
+ return $product->getData ( 'sync_with_dhl_mein_paket' ) > 0;
44
+ }
45
+
46
  /**
47
  * Tells if the given product has a valid ean.
48
  *
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
 
297
  $description = $this->__ ( 'Missing value for field' ) . ' "<i><b>' . $this->__ ( $this->getLabelForFieldName ( $errorCode ) ) . '</b></i>".';
298
  break;
299
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_PRODUCT_NOT_EXISTS_IN_MEINPAKET :
300
+ $description = $this->__ ( 'Product is unknown in Allyouneed marketplace' ) . '.';
301
  break;
302
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_PRODUCT_NEGATIVE_STOCK :
303
  $description = $this->__ ( 'Product stock is lower than zero.' );
304
  break;
305
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_MEINPAKET_SERVER_ERROR :
306
+ $description = $this->__ ( 'Internal error on Allyouneed server' ) . '.';
307
  break;
308
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_NOT_AUTHORIZED :
309
+ $description = $this->__ ( 'You are not authorized to execute the requested functionality on Allyouneed' );
310
  break;
311
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_INVALID_DATA :
312
  $description = $this->__ ( 'The provided data was incorrect' );
313
  break;
314
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_INVALID_MODIFICATION :
315
+ $description = $this->__ ( 'Invalid modification of element' );
316
  break;
317
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_NO_CATEGORIZATION :
318
  $description = $this->__ ( 'The product is not mapped to neither a marketplace nor a shop category' );
321
  $description = $this->__ ( 'The referenced product cannot be sold' );
322
  break;
323
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_MARKETPLACE_CATEGORY_NOT_FOUND :
324
+ $description = $this->__ ( 'The referenced marketplace category could not be found at Allyouneed' );
325
  break;
326
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_SHOP_CATEGORY_NOT_FOUND :
327
+ $description = $this->__ ( 'The referenced shop category could not be found at Allyouneed' );
328
  break;
329
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_MISSING_VALUE_FOR_ATTRIBUTE :
330
  $description = $this->__ ( 'Missing value mapping for attribute' ) . ' "' . $errorCode . '".';
331
  break;
332
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_VARIANT_GROUP_NOT_EXISTS :
333
+ $description = $this->__ ( 'Variant group does not exist on Allyouneed' ) . ' "' . $errorCode . '".';
334
  break;
335
  case Dhl_MeinPaket_Model_Validation_ValidationInterface::ERROR_UNDEFINED :
336
  default :
app/code/community/Dhl/MeinPaket/Helper/Shipment.php CHANGED
@@ -10,7 +10,7 @@
10
  */
11
  class Dhl_MeinPaket_Helper_Shipment extends Mage_Core_Helper_Abstract {
12
  /**
13
- * Tells if the given order is an order that was imported from MeinPaket.de.
14
  *
15
  * @param Mage_Sales_Model_Order_Shipment $shipment
16
  * to check
10
  */
11
  class Dhl_MeinPaket_Helper_Shipment extends Mage_Core_Helper_Abstract {
12
  /**
13
+ * Tells if the given order is an order that was imported from Allyouneed.
14
  *
15
  * @param Mage_Sales_Model_Order_Shipment $shipment
16
  * to check
app/code/community/Dhl/MeinPaket/Model/Cron.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
 
3
  /**
4
- * Cron handler for Dhl MeinPaket.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
1
  <?php
2
 
3
  /**
4
+ * Cron handler for Dhl Allyouneed.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
app/code/community/Dhl/MeinPaket/Model/Mysql4/Category.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
 
3
  /**
4
- * MeinPaket category resource model
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
1
  <?php
2
 
3
  /**
4
+ * Allyouneed category resource model
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
app/code/community/Dhl/MeinPaket/Model/Mysql4/Category/Collection.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
 
3
  /**
4
- * MeinPaket category collection.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
1
  <?php
2
 
3
  /**
4
+ * Allyouneed category collection.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
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,22 +142,21 @@ 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' );
156
  $attribute = $observer->getAttribute ();
157
  $fieldset->addField ( 'meinpaket_attribute', 'select', array (
158
  'name' => 'meinpaket_attribute',
159
- 'label' => Mage::helper ( 'meinpaket' )->__ ( 'MeinPaket Attribute' ),
160
- 'title' => Mage::helper ( 'meinpaket' )->__ ( 'MeinPaket Attribute' ),
161
  'values' => Mage::getModel ( 'meinpaket/system_config_source_attributes' )->toOptionArray ()
162
  ) );
163
  }
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' );
155
  $attribute = $observer->getAttribute ();
156
  $fieldset->addField ( 'meinpaket_attribute', 'select', array (
157
  'name' => 'meinpaket_attribute',
158
+ 'label' => Mage::helper ( 'meinpaket' )->__ ( 'Allyouneed Attribute' ),
159
+ 'title' => Mage::helper ( 'meinpaket' )->__ ( 'Allyouneed Attribute' ),
160
  'values' => Mage::getModel ( 'meinpaket/system_config_source_attributes' )->toOptionArray ()
161
  ) );
162
  }
app/code/community/Dhl/MeinPaket/Model/Payment/Method/Meinpaket.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
 
3
  /**
4
- * MeinPaket payment method for imported orders.
5
  *
6
  * @category Mage
7
  * @package Dhl_MeinPaket
1
  <?php
2
 
3
  /**
4
+ * Allyouneed payment method for imported orders.
5
  *
6
  * @category Mage
7
  * @package Dhl_MeinPaket
app/code/community/Dhl/MeinPaket/Model/Resource/Eav/Mysql4/Setup.php CHANGED
@@ -1,59 +1,3 @@
1
  <?php
2
  class Dhl_MeinPaket_Model_Resource_Eav_Mysql4_Setup extends Mage_Catalog_Model_Resource_Setup {
3
- /**
4
- *
5
- * @return array
6
- */
7
- public function getDefaultEntities() {
8
- return array (
9
- 'catalog_product' => array (
10
- 'entity_model' => 'catalog/product',
11
- 'attribute_model' => 'catalog/resource_eav_attribute',
12
- 'table' => 'catalog/product',
13
- 'additional_attribute_table' => 'catalog/eav_attribute',
14
- 'entity_attribute_collection' => 'catalog/product_attribute_collection',
15
- 'attributes' => array (
16
- 'meinpaket_id' => array (
17
- 'type' => 'int',
18
- 'label' => 'Product DHL MeinPaket Id',
19
- 'required' => false,
20
- 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL,
21
- 'visible' => false,
22
- 'group' => 'DHL MeinPaket'
23
- ),
24
- 'sync_with_dhl_mein_paket' => array (
25
- 'type' => 'int',
26
- 'label' => 'Sync with MeinPaket.de',
27
- 'frontend' => 'meinpaket/entity_attribute_frontend_labelTranslation',
28
- 'input' => 'select',
29
- 'source' => 'meinpaket/entity_attribute_source_productSyncMode',
30
- 'required' => false,
31
- 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL,
32
- 'visible' => true,
33
- 'group' => 'DHL MeinPaket'
34
- ),
35
- 'max_stock_for_dhl_mein_paket' => array (
36
- 'type' => 'int',
37
- 'label' => 'Maximum stock qty. for MeinPaket.de',
38
- 'frontend' => 'meinpaket/entity_attribute_frontend_labelTranslation',
39
- 'input' => 'text',
40
- 'required' => false,
41
- 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL,
42
- 'visible' => true,
43
- 'group' => 'DHL MeinPaket'
44
- ),
45
- 'meinpaket_category' => array (
46
- 'type' => 'text',
47
- 'label' => 'DHL MeinPaket Category',
48
- 'input' => 'select',
49
- 'source' => 'meinpaket/entity_attribute_source_meinPaketCategory',
50
- 'required' => false,
51
- 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL,
52
- 'visible' => true,
53
- 'group' => 'DHL MeinPaket'
54
- )
55
- )
56
- )
57
- );
58
- }
59
  }
1
  <?php
2
  class Dhl_MeinPaket_Model_Resource_Eav_Mysql4_Setup extends Mage_Catalog_Model_Resource_Setup {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3
  }
app/code/community/Dhl/MeinPaket/Model/Service/MarketplaceCategoryImport/Result.php CHANGED
@@ -73,7 +73,7 @@ class Dhl_MeinPaket_Model_Service_MarketplaceCategoryImport_Result extends Dhl_M
73
  /**
74
  * Returns the names of the categories which have been deleted
75
  * because they were existent in Magento but don't exist
76
- * in MeinPaket's marketplace category structure anymore.
77
  *
78
  * @return array
79
  */
73
  /**
74
  * Returns the names of the categories which have been deleted
75
  * because they were existent in Magento but don't exist
76
+ * in Allyouneed marketplace category structure anymore.
77
  *
78
  * @return array
79
  */
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
  /**
@@ -32,6 +32,9 @@ class Dhl_MeinPaket_Model_Service_Product_Export extends Dhl_MeinPaketCommon_Mod
32
  */
33
  public function exportProducts() {
34
  $cycleCount = Mage::getStoreConfig ( 'meinpaket/advanced/cycle_product_count' );
 
 
 
35
 
36
  $seenMagentoProducts = array ();
37
 
@@ -41,15 +44,24 @@ class Dhl_MeinPaket_Model_Service_Product_Export extends Dhl_MeinPaketCommon_Mod
41
  $client = Mage::getModel ( 'meinpaketcommon/client_xmlOverHttp' );
42
 
43
  $count = 0;
 
44
 
45
  /* @var $productBacklogs Dhl_MeinPaket_Model_Mysql4_Backlog_Product_Collection */
46
  $productBacklogs = Mage::getModel ( 'meinpaket/backlog_product' )->getCollection ();
47
- $productBacklogs->setPageSize ( 100 )->setCurPage ( 1 );
 
 
 
48
 
49
- while ( $count < $cycleCount && $productBacklogs->count () > 0 && $productBacklogs->getCurPage () <= $productBacklogs->getLastPageNumber () ) {
 
 
 
 
 
 
50
  foreach ( $productBacklogs as $productBacklog ) {
51
  $productId = $productBacklog->getProductId ();
52
-
53
  $changes = explode ( ',', $productBacklog->getChanges () );
54
 
55
  try {
@@ -57,7 +69,8 @@ class Dhl_MeinPaket_Model_Service_Product_Export extends Dhl_MeinPaketCommon_Mod
57
  $seenMagentoProducts [$productId] = true;
58
 
59
  /* @var $product Mage_Catalog_Model_Product */
60
- $product = Mage::getModel ( 'catalog/product' )->load ( $productId );
 
61
 
62
  $syncMode = $product->getData ( 'sync_with_dhl_mein_paket' );
63
 
@@ -76,26 +89,27 @@ class Dhl_MeinPaket_Model_Service_Product_Export extends Dhl_MeinPaketCommon_Mod
76
  Mage::log ( 'Product m' . $productId . ' already synced' );
77
  }
78
 
79
- $count ++;
80
-
81
  $productBacklog->delete ();
 
82
  } catch ( Exception $ex ) {
83
  Mage::logException ( $ex );
84
- // TODO: add error
85
- // $result ['error'] ++;
86
  Mage::log ( 'Error syncing product m' . $productId );
87
  }
88
  }
89
 
90
- // Set next page
91
- $productBacklogs->setCurPage ( $productBacklogs->getCurPage () + 1 );
92
- }
 
 
 
 
93
 
94
  if ($uploadRequest->isHasData ()) {
95
  $response = $client->send ( $uploadRequest, true );
96
  }
97
 
98
- if ($productBacklogs->count () >= $cycleCount) {
99
  Mage::helper ( 'meinpaket/cron' )->scheduleJobs ( array (
100
  Dhl_MeinPaket_Model_Cron::SYNC_ASYNC
101
  ), false );
21
  */
22
  public function __construct() {
23
  $this->_processableProducts = array ();
24
+ $this->_productHelper = Mage::helper ( 'meinpaketcommon/product' );
25
  }
26
 
27
  /**
32
  */
33
  public function exportProducts() {
34
  $cycleCount = Mage::getStoreConfig ( 'meinpaket/advanced/cycle_product_count' );
35
+ if (! is_numeric ( $cycleCount )) {
36
+ $cycleCount = 100;
37
+ }
38
 
39
  $seenMagentoProducts = array ();
40
 
44
  $client = Mage::getModel ( 'meinpaketcommon/client_xmlOverHttp' );
45
 
46
  $count = 0;
47
+ $currentPage = 1;
48
 
49
  /* @var $productBacklogs Dhl_MeinPaket_Model_Mysql4_Backlog_Product_Collection */
50
  $productBacklogs = Mage::getModel ( 'meinpaket/backlog_product' )->getCollection ();
51
+ $productBacklogs->setPageSize ( $cycleCount );
52
+ $productBacklogs->addOrder ( 'product_id', Varien_Data_Collection::SORT_ORDER_ASC );
53
+
54
+ $pages = $productBacklogs->getLastPageNumber ();
55
 
56
+ do {
57
+ $productBacklogs->setCurPage ( $currentPage );
58
+ $productBacklogs->load ();
59
+ if ($productBacklogs->count () <= 0) {
60
+ break;
61
+ }
62
+
63
  foreach ( $productBacklogs as $productBacklog ) {
64
  $productId = $productBacklog->getProductId ();
 
65
  $changes = explode ( ',', $productBacklog->getChanges () );
66
 
67
  try {
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
 
89
  Mage::log ( 'Product m' . $productId . ' already synced' );
90
  }
91
 
 
 
92
  $productBacklog->delete ();
93
+ $count ++;
94
  } catch ( Exception $ex ) {
95
  Mage::logException ( $ex );
 
 
96
  Mage::log ( 'Error syncing product m' . $productId );
97
  }
98
  }
99
 
100
+ /**
101
+ * We deleted all products on the first page.
102
+ * If we load this page again, there will be new products.
103
+ */
104
+ // $currentPage ++;
105
+ $productBacklogs->clear ();
106
+ } while ( $count < $cycleCount );
107
 
108
  if ($uploadRequest->isHasData ()) {
109
  $response = $client->send ( $uploadRequest, true );
110
  }
111
 
112
+ if ($currentPage < $pages) {
113
  Mage::helper ( 'meinpaket/cron' )->scheduleJobs ( array (
114
  Dhl_MeinPaket_Model_Cron::SYNC_ASYNC
115
  ), false );
app/code/community/Dhl/MeinPaket/Model/Service/ProductData/RequestService.php CHANGED
@@ -1,16 +1,16 @@
1
  <?php
2
 
3
  /**
4
- * Service which exports an order's shipment to MeinPaket.de.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
8
  * @subpackage Model_Service_ShipmentExport
9
  * @version $Id$
10
  */
11
- class Dhl_MeinPaketCommon_Model_Service_ProductData_RequestService {
12
  /**
13
- * Exports a shipment to MeinPaket.de.
14
  *
15
  * @param Mage_Catalog_Model_Product $product
16
  * @throws Dhl_MeinPaket_Model_Xml_XmlBuildException
@@ -24,7 +24,7 @@ class Dhl_MeinPaketCommon_Model_Service_ProductData_RequestService {
24
  $productDataRequest = Mage::getModel ( 'meinpaketcommon/xml_request_dataRequest' );
25
 
26
  /* @var $client Dhl_MeinPaket_Model_Client_XmlOverHttp */
27
- $client = Mage::getModel ( 'meinpaket/client_xmlOverHttp' );
28
 
29
  try {
30
  $productDataRequest->addProduct ( $product, $sendEAN, $sendName );
@@ -57,7 +57,7 @@ class Dhl_MeinPaketCommon_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' => ''
1
  <?php
2
 
3
  /**
4
+ * Service which exports an order's shipment to Allyouneed.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
8
  * @subpackage Model_Service_ShipmentExport
9
  * @version $Id$
10
  */
11
+ class Dhl_MeinPaket_Model_Service_ProductData_RequestService {
12
  /**
13
+ * Exports a shipment to Allyouneed.
14
  *
15
  * @param Mage_Catalog_Model_Product $product
16
  * @throws Dhl_MeinPaket_Model_Xml_XmlBuildException
24
  $productDataRequest = Mage::getModel ( 'meinpaketcommon/xml_request_dataRequest' );
25
 
26
  /* @var $client Dhl_MeinPaket_Model_Client_XmlOverHttp */
27
+ $client = Mage::getModel ( 'meinpaketcommon/client_xmlOverHttp' );
28
 
29
  try {
30
  $productDataRequest->addProduct ( $product, $sendEAN, $sendName );
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
@@ -1,7 +1,7 @@
1
  <?php
2
 
3
  /**
4
- * Controller for MeinPaket marketplace category structure import.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
@@ -16,9 +16,17 @@ class Dhl_MeinPaket_Adminhtml_CategoryImportController extends Mage_Adminhtml_Co
16
  */
17
  protected function _initAction() {
18
  $this->loadLayout ()->_setActiveMenu ( 'meinpaket' );
19
- $this->_title ( $this->__ ( 'MeinPaket.de' ) )->_title ( $this->__ ( 'Category Import' ) );
20
  return $this;
21
  }
 
 
 
 
 
 
 
 
22
 
23
  /**
24
  * Default action.
@@ -48,10 +56,10 @@ class Dhl_MeinPaket_Adminhtml_CategoryImportController extends Mage_Adminhtml_Co
48
  $result = $service->importMarketplaceCategoryStructure ();
49
  } catch ( Dhl_MeinPaket_Model_Client_BadHttpReturnCodeException $e ) {
50
  Mage::logException ( $e );
51
- $errorMsg = $this->__ ( 'Connecting to MeinPaket.de server failed.' );
52
  } catch ( Dhl_MeinPaket_Model_Client_HttpTimeoutException $e ) {
53
  Mage::logException ( $e );
54
- $errorMsg = $this->__ ( 'Connection to MeinPaket.de server timed out.' );
55
  } catch ( Exception $e ) {
56
  Mage::logException ( $e );
57
  $errorMsg = $this->__ ( 'Unknown error' ) . '. (' . $e->getMessage () . ')';
1
  <?php
2
 
3
  /**
4
+ * Controller for Allyouneed marketplace category structure import.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
16
  */
17
  protected function _initAction() {
18
  $this->loadLayout ()->_setActiveMenu ( 'meinpaket' );
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.
56
  $result = $service->importMarketplaceCategoryStructure ();
57
  } catch ( Dhl_MeinPaket_Model_Client_BadHttpReturnCodeException $e ) {
58
  Mage::logException ( $e );
59
+ $errorMsg = $this->__ ( 'Connecting to Allyouneed server failed.' );
60
  } catch ( Dhl_MeinPaket_Model_Client_HttpTimeoutException $e ) {
61
  Mage::logException ( $e );
62
+ $errorMsg = $this->__ ( 'Connection to Allyouneed server timed out.' );
63
  } catch ( Exception $e ) {
64
  Mage::logException ( $e );
65
  $errorMsg = $this->__ ( 'Unknown error' ) . '. (' . $e->getMessage () . ')';
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
@@ -1,7 +1,7 @@
1
  <?php
2
 
3
  /**
4
- * Controls the export of local products to MeinPaket.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
@@ -35,11 +35,20 @@ class Dhl_MeinPaket_Adminhtml_ProductExportController extends Mage_Adminhtml_Con
35
  protected function _initAction() {
36
  $this->loadLayout ()->_setActiveMenu ( 'meinpaket' );
37
 
38
- $this->_title ( $this->__ ( 'MeinPaket.de' ) )->_title ( $this->__ ( 'Product Export' ) );
39
 
40
  return $this;
41
  }
42
 
 
 
 
 
 
 
 
 
 
43
  /**
44
  * Default action.
45
  *
@@ -63,7 +72,7 @@ class Dhl_MeinPaket_Adminhtml_ProductExportController extends Mage_Adminhtml_Con
63
  }
64
 
65
  /**
66
- * Transfers descriptions and offers of the selected products to MeinPaket.
67
  *
68
  * @return void
69
  */
@@ -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
 
1
  <?php
2
 
3
  /**
4
+ * Controls the export of local products to Allyouneed.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
35
  protected function _initAction() {
36
  $this->loadLayout ()->_setActiveMenu ( 'meinpaket' );
37
 
38
+ $this->_title ( $this->__ ( 'Allyouneed' ) )->_title ( $this->__ ( 'Product Export' ) );
39
 
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
  *
72
  }
73
 
74
  /**
75
+ * Transfers descriptions and offers of the selected products to Allyouneed.
76
  *
77
  * @return void
78
  */
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
@@ -2,29 +2,29 @@
2
  <config>
3
  <menu>
4
  <meinpaket>
5
- <title>MeinPaket / 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,12 +34,37 @@
34
  <resources>
35
  <admin>
36
  <children>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
37
  <system>
38
  <children>
39
  <config>
40
  <children>
41
  <meinpaket translate="title" module="meinpaket">
42
- <title>MeinPaket / Postpay</title>
43
  <sort_order>100</sort_order>
44
  </meinpaket>
45
  </children>
2
  <config>
3
  <menu>
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>
65
  <children>
66
  <meinpaket translate="title" module="meinpaket">
67
+ <title>Allyouneed / Postpay</title>
68
  <sort_order>100</sort_order>
69
  </meinpaket>
70
  </children>
app/code/community/Dhl/MeinPaket/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Dhl_MeinPaket>
5
- <version>2.0.16</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/MeinPaket/etc/system.xml CHANGED
@@ -10,10 +10,10 @@
10
  <show_in_default>1</show_in_default>
11
  <show_in_website>1</show_in_website>
12
  <show_in_store>0</show_in_store>
13
- <frontend_class>meinpaket</frontend_class>
14
  <fields>
15
  <active translate="label comment">
16
- <label>Meinpaket Active</label>
17
  <comment><![CDATA[Disable Postpay using Configuration / Payment Methods / Postpay Standard and Postpay Express.]]></comment>
18
  <frontend_type>select</frontend_type>
19
  <source_model>adminhtml/system_config_source_yesno</source_model>
@@ -25,13 +25,13 @@
25
  </fields>
26
  </credentials>
27
  <taxrates translate="label">
28
- <label>Tax rates (nur MeinPaket)</label>
29
  <frontend_type>text</frontend_type>
30
  <sort_order>30</sort_order>
31
  <show_in_default>1</show_in_default>
32
  <show_in_website>1</show_in_website>
33
  <show_in_store>0</show_in_store>
34
- <frontend_class>meinpaket</frontend_class>
35
  <fields>
36
  <default_tax_rate translate="label comment">
37
  <label>Default tax rate</label>
@@ -57,17 +57,17 @@
57
  </fields>
58
  </taxrates>
59
  <product_attributes translate="label">
60
- <label>Product attributes (nur MeinPaket)</label>
61
  <frontend_type>text</frontend_type>
62
  <sort_order>40</sort_order>
63
  <show_in_default>1</show_in_default>
64
  <show_in_website>1</show_in_website>
65
  <show_in_store>0</show_in_store>
66
- <frontend_class>meinpaket</frontend_class>
67
  <fields>
68
  <ean_attribute translate="label comment">
69
  <label>EAN</label>
70
- <comment><![CDATA[Attribute containing EAN]]></comment>
71
  <frontend_type>select</frontend_type>
72
  <source_model>meinpaket/entity_attribute_source_productAttribute</source_model>
73
  <sort_order>1</sort_order>
@@ -76,7 +76,7 @@
76
  <show_in_store>0</show_in_store>
77
  </ean_attribute>
78
  <delivery_time translate="label comment">
79
- <label>Delivery time</label>
80
  <comment><![CDATA[Please select the product attribute which represents the approx. delivery time]]></comment>
81
  <frontend_type>select</frontend_type>
82
  <source_model>meinpaket/entity_attribute_source_productAttribute</source_model>
@@ -108,13 +108,13 @@
108
  </fields>
109
  </product_attributes>
110
  <customer translate="label">
111
- <label>Customer (nur MeinPaket)</label>
112
  <frontend_type>text</frontend_type>
113
  <sort_order>50</sort_order>
114
  <show_in_default>1</show_in_default>
115
  <show_in_website>1</show_in_website>
116
  <show_in_store>0</show_in_store>
117
- <frontend_class>meinpaket</frontend_class>
118
  <fields>
119
  <default_email translate="label comment">
120
  <label>Default customer email</label>
@@ -135,10 +135,10 @@
135
  <show_in_default>1</show_in_default>
136
  <show_in_website>1</show_in_website>
137
  <show_in_store>0</show_in_store>
138
- <frontend_class>meinpaket</frontend_class>
139
  <fields>
140
  <product translate="label comment">
141
- <label>Product Export (nur MeinPaket)</label>
142
  <comment><![CDATA[Product export interval]]></comment>
143
  <frontend_type>text</frontend_type>
144
  <sort_order>100</sort_order>
@@ -147,7 +147,7 @@
147
  <show_in_store>0</show_in_store>
148
  </product>
149
  <bestprice translate="label comment">
150
- <label>BestPrice Interval (nur MeinPaket)</label>
151
  <comment><![CDATA[BestPrice refresh interval.]]></comment>
152
  <frontend_type>text</frontend_type>
153
  <sort_order>110</sort_order>
@@ -158,13 +158,13 @@
158
  </fields>
159
  </cron>
160
  <advanced translate="label">
161
- <label>Advanced (nur MeinPaket)</label>
162
  <frontend_type>text</frontend_type>
163
  <sort_order>150</sort_order>
164
  <show_in_default>1</show_in_default>
165
  <show_in_website>1</show_in_website>
166
  <show_in_store>0</show_in_store>
167
- <frontend_class>meinpaket</frontend_class>
168
  <fields>
169
  <cycle_product_count translate="label comment">
170
  <label>Cycle product count</label>
10
  <show_in_default>1</show_in_default>
11
  <show_in_website>1</show_in_website>
12
  <show_in_store>0</show_in_store>
13
+ <frontend_class>allyouneed</frontend_class>
14
  <fields>
15
  <active translate="label comment">
16
+ <label>Allyouneed Active</label>
17
  <comment><![CDATA[Disable Postpay using Configuration / Payment Methods / Postpay Standard and Postpay Express.]]></comment>
18
  <frontend_type>select</frontend_type>
19
  <source_model>adminhtml/system_config_source_yesno</source_model>
25
  </fields>
26
  </credentials>
27
  <taxrates translate="label">
28
+ <label>Tax rates (nur Allyouneed)</label>
29
  <frontend_type>text</frontend_type>
30
  <sort_order>30</sort_order>
31
  <show_in_default>1</show_in_default>
32
  <show_in_website>1</show_in_website>
33
  <show_in_store>0</show_in_store>
34
+ <frontend_class>allyouneed</frontend_class>
35
  <fields>
36
  <default_tax_rate translate="label comment">
37
  <label>Default tax rate</label>
57
  </fields>
58
  </taxrates>
59
  <product_attributes translate="label">
60
+ <label>Product attributes (only Allyouneed)</label>
61
  <frontend_type>text</frontend_type>
62
  <sort_order>40</sort_order>
63
  <show_in_default>1</show_in_default>
64
  <show_in_website>1</show_in_website>
65
  <show_in_store>0</show_in_store>
66
+ <frontend_class>allyouneed</frontend_class>
67
  <fields>
68
  <ean_attribute translate="label comment">
69
  <label>EAN</label>
70
+ <comment><![CDATA[Product attribute containing EAN]]></comment>
71
  <frontend_type>select</frontend_type>
72
  <source_model>meinpaket/entity_attribute_source_productAttribute</source_model>
73
  <sort_order>1</sort_order>
76
  <show_in_store>0</show_in_store>
77
  </ean_attribute>
78
  <delivery_time translate="label comment">
79
+ <label>Delivery time attribute</label>
80
  <comment><![CDATA[Please select the product attribute which represents the approx. delivery time]]></comment>
81
  <frontend_type>select</frontend_type>
82
  <source_model>meinpaket/entity_attribute_source_productAttribute</source_model>
108
  </fields>
109
  </product_attributes>
110
  <customer translate="label">
111
+ <label>Customer (nur Allyouneed)</label>
112
  <frontend_type>text</frontend_type>
113
  <sort_order>50</sort_order>
114
  <show_in_default>1</show_in_default>
115
  <show_in_website>1</show_in_website>
116
  <show_in_store>0</show_in_store>
117
+ <frontend_class>allyouneed</frontend_class>
118
  <fields>
119
  <default_email translate="label comment">
120
  <label>Default customer email</label>
135
  <show_in_default>1</show_in_default>
136
  <show_in_website>1</show_in_website>
137
  <show_in_store>0</show_in_store>
138
+ <frontend_class>allyouneed</frontend_class>
139
  <fields>
140
  <product translate="label comment">
141
+ <label>Product Export (only Allyouneed)</label>
142
  <comment><![CDATA[Product export interval]]></comment>
143
  <frontend_type>text</frontend_type>
144
  <sort_order>100</sort_order>
147
  <show_in_store>0</show_in_store>
148
  </product>
149
  <bestprice translate="label comment">
150
+ <label>BestPrice Interval (only Allyouneed)</label>
151
  <comment><![CDATA[BestPrice refresh interval.]]></comment>
152
  <frontend_type>text</frontend_type>
153
  <sort_order>110</sort_order>
158
  </fields>
159
  </cron>
160
  <advanced translate="label">
161
+ <label>Advanced (only Allyouneed)</label>
162
  <frontend_type>text</frontend_type>
163
  <sort_order>150</sort_order>
164
  <show_in_default>1</show_in_default>
165
  <show_in_website>1</show_in_website>
166
  <show_in_store>0</show_in_store>
167
+ <frontend_class>allyouneed</frontend_class>
168
  <fields>
169
  <cycle_product_count translate="label comment">
170
  <label>Cycle product count</label>
app/code/community/Dhl/MeinPaket/sql/meinpaket_setup/mysql4-install-1.0.0.php CHANGED
@@ -3,26 +3,10 @@
3
  * Setup-Script fuer Dhl_MeinPaket
4
  *
5
  * Uninstall MeinPaket:
6
- * delete from core_resource where code = 'meinpaket_setup';
7
- * delete from eav_attribute where attribute_code = "is_dhl_mein_paket_root";
8
- * delete from eav_attribute where attribute_code = "is_dhl_marketplace_root";
9
- * delete from eav_attribute where attribute_code = "dhl_marketplace_category_id";
10
- * delete from eav_attribute where attribute_code = "sync_with_dhl_mein_paket";
11
- * delete from eav_attribute where attribute_code = "max_stock_for_dhl_mein_paket";
12
- * delete from eav_attribute where attribute_code = "shipment_was_exported_for_dhl_mein_paket";
13
- * delete from eav_attribute where attribute_code = "dhl_mein_paket_order_id";
14
- * delete from eav_attribute_group where attribute_group_name = "MeinPaket.de";
15
- * alter table sales_flat_order drop column dhl_mein_paket_order_id;
16
- * alter table sales_flat_order_grid drop column dhl_mein_paket_order_id;
17
- *
18
- * @author Andreas Demmer <andreas.demmer@aoemedia.de>
19
  */
20
 
21
  /* @var $installer Dhl_MeinPaket_Model_Resource_Eav_Mysql4_Setup */
22
  $installer = $this;
23
  $installer->startSetup ();
24
 
25
- // Mage::getSingleton ( 'adminhtml/session' )->addSuccess ( 'DHL MeinPaket.de extension was successfully installed!' );
26
-
27
- $installer->installEntities ();
28
  $installer->endSetup ();
3
  * Setup-Script fuer Dhl_MeinPaket
4
  *
5
  * Uninstall MeinPaket:
 
 
 
 
 
 
 
 
 
 
 
 
 
6
  */
7
 
8
  /* @var $installer Dhl_MeinPaket_Model_Resource_Eav_Mysql4_Setup */
9
  $installer = $this;
10
  $installer->startSetup ();
11
 
 
 
 
12
  $installer->endSetup ();
app/code/community/Dhl/MeinPaket/sql/meinpaket_setup/mysql4-upgrade-1.0.0-1.1.0.php CHANGED
@@ -4,6 +4,4 @@
4
  $installer = $this;
5
  $installer->startSetup ();
6
 
7
- $installer->installEntities ();
8
-
9
  $installer->endSetup ();
4
  $installer = $this;
5
  $installer->startSetup ();
6
 
 
 
7
  $installer->endSetup ();
app/code/community/Dhl/MeinPaket/sql/meinpaket_setup/mysql4-upgrade-1.1.0-2.0.0.php CHANGED
@@ -4,8 +4,6 @@
4
  $installer = $this;
5
  $installer->startSetup ();
6
 
7
- $installer->installEntities ();
8
-
9
  $installer->run ( "
10
  DROP TABLE IF EXISTS {$this->getTable('meinpaket/category')};
11
  CREATE TABLE {$this->getTable('meinpaket/category')} (
@@ -15,7 +13,7 @@ CREATE TABLE {$this->getTable('meinpaket/category')} (
15
  `parent` varchar(255) not null,
16
  `leaf` tinyint(1) unsigned not null ,
17
  PRIMARY KEY (`category_id`)
18
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='MeinPaket Categories';
19
  " );
20
 
21
  $installer->run ( "
@@ -27,7 +25,7 @@ $installer->run ( "
27
  `created_at` datetime default '0000-00-00 00:00:00',
28
  PRIMARY KEY(`backlog_id`),
29
  CONSTRAINT `FK_MEINPAKET_PRODUCT_BACKLOG_PRODUCT_ID` FOREIGN KEY (`product_id`) REFERENCES {$installer->getTable('catalog_product_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE
30
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='MeinPaket Backlog';
31
  " );
32
 
33
  $installer->run ( "
@@ -46,9 +44,9 @@ $installer->run ( "
46
  `created_at` datetime default '0000-00-00 00:00:00',
47
  PRIMARY KEY(`bestprice_id`),
48
  CONSTRAINT `FK_MEINPAKET_BESTPRICE_PRODUCT_ID` FOREIGN KEY (`product_id`) REFERENCES {$installer->getTable('catalog_product_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE
49
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='MeinPaket BestPrices';
50
  " );
51
 
52
- $installer->getConnection ()->addColumn ( $installer->getTable ( 'catalog/eav_attribute' ), 'meinpaket_attribute', "VARCHAR( 255 ) DEFAULT 'None' COMMENT 'MeinPaket Attribute'" );
53
 
54
  $installer->endSetup ();
4
  $installer = $this;
5
  $installer->startSetup ();
6
 
 
 
7
  $installer->run ( "
8
  DROP TABLE IF EXISTS {$this->getTable('meinpaket/category')};
9
  CREATE TABLE {$this->getTable('meinpaket/category')} (
13
  `parent` varchar(255) not null,
14
  `leaf` tinyint(1) unsigned not null ,
15
  PRIMARY KEY (`category_id`)
16
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Allyouneed Categories';
17
  " );
18
 
19
  $installer->run ( "
25
  `created_at` datetime default '0000-00-00 00:00:00',
26
  PRIMARY KEY(`backlog_id`),
27
  CONSTRAINT `FK_MEINPAKET_PRODUCT_BACKLOG_PRODUCT_ID` FOREIGN KEY (`product_id`) REFERENCES {$installer->getTable('catalog_product_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE
28
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Allyouneed Backlog';
29
  " );
30
 
31
  $installer->run ( "
44
  `created_at` datetime default '0000-00-00 00:00:00',
45
  PRIMARY KEY(`bestprice_id`),
46
  CONSTRAINT `FK_MEINPAKET_BESTPRICE_PRODUCT_ID` FOREIGN KEY (`product_id`) REFERENCES {$installer->getTable('catalog_product_entity')} (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE
47
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Allyouneed BestPrices';
48
  " );
49
 
50
+ $installer->getConnection ()->addColumn ( $installer->getTable ( 'catalog/eav_attribute' ), 'meinpaket_attribute', "VARCHAR( 255 ) DEFAULT 'None' COMMENT 'Allyouneed Attribute'" );
51
 
52
  $installer->endSetup ();
app/code/community/Dhl/MeinPaket/sql/meinpaket_setup/mysql4-upgrade-2.1.0-2.2.0.php ADDED
@@ -0,0 +1,50 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ /* @var $installer Dhl_MeinPaket_Model_Resource_Eav_Mysql4_Setup */
4
+ $installer = $this;
5
+ $installer->startSetup ();
6
+
7
+ $installer->addAttribute ( 'catalog_product', 'meinpaket_id', array (
8
+ 'type' => 'int',
9
+ 'label' => 'Product DHL Allyouneed Id',
10
+ 'required' => false,
11
+ 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL,
12
+ 'visible' => false,
13
+ 'group' => 'Allyouneed'
14
+ ) );
15
+
16
+ $installer->addAttribute ( 'catalog_product', 'sync_with_dhl_mein_paket', array (
17
+ 'type' => 'int',
18
+ 'label' => 'Sync with Allyouneed',
19
+ 'frontend' => 'meinpaket/entity_attribute_frontend_labelTranslation',
20
+ 'input' => 'select',
21
+ 'source' => 'meinpaket/entity_attribute_source_productSyncMode',
22
+ 'required' => false,
23
+ 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL,
24
+ 'visible' => true,
25
+ 'group' => 'Allyouneed'
26
+ ) );
27
+
28
+ $installer->addAttribute ( 'catalog_product', 'max_stock_for_dhl_mein_paket', array (
29
+ 'type' => 'int',
30
+ 'label' => 'Maximum stock qty. for Allyouneed',
31
+ 'frontend' => 'meinpaket/entity_attribute_frontend_labelTranslation',
32
+ 'input' => 'text',
33
+ 'required' => false,
34
+ 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL,
35
+ 'visible' => true,
36
+ 'group' => 'Allyouneed'
37
+ ) );
38
+
39
+ $installer->addAttribute ( 'catalog_product', 'meinpaket_category', array (
40
+ 'type' => 'text',
41
+ 'label' => 'Allyouneed Category',
42
+ 'input' => 'select',
43
+ 'source' => 'meinpaket/entity_attribute_source_meinPaketCategory',
44
+ 'required' => false,
45
+ 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL,
46
+ 'visible' => true,
47
+ 'group' => 'Allyouneed'
48
+ ) );
49
+
50
+ $installer->endSetup ();
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/Block/Adminhtml/Version.php ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
1
+ <?php
2
+ class Dhl_MeinPaketCommon_Block_Adminhtml_Version extends Mage_Adminhtml_Block_System_Config_Form_Field {
3
+ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) {
4
+ return ( string ) Mage::helper ( 'meinpaketcommon/data' )->getExtensionVersion ();
5
+ }
6
+ }
app/code/community/Dhl/MeinPaketCommon/Helper/Data.php CHANGED
@@ -8,62 +8,12 @@
8
  * @subpackage Helper
9
  */
10
  class Dhl_MeinPaketCommon_Helper_Data extends Mage_Core_Helper_Abstract {
11
- /**
12
- * Creates/extends JavaScript language object by the given labels.
13
- * The given labels array must have the structure array('key1'=>'label1','key2'=>'label2',...).
14
- * Key is the key under which the label will be accessible in frontend JavaScript.
15
- * Label is the untranslated label.
16
- * Example: Element is 'foo'=>'Bar'. So use MeinPaket.locale.foo .
17
- *
18
- * @param array $labels
19
- * @return string
20
- */
21
- public function createLocaleJS(array $labels) {
22
- $js = 'if(typeof MeinPaket === "undefined"){var MeinPaket={};}';
23
- $js .= 'if(typeof MeinPaket.locale === "undefined"){MeinPaket.locale={};}';
24
- $js .= 'Object.extend(MeinPaket.locale,{';
25
-
26
- $firstItem = true;
27
- if (sizeof ( $labels ) > 0) {
28
- foreach ( $labels as $key => $label ) {
29
- $js .= $this->_addJSLocaleLabel ( $key, $this->__ ( $label ), $firstItem );
30
- if ($firstItem) {
31
- $firstItem = false;
32
- }
33
- }
34
- }
35
-
36
- $js .= '});';
37
-
38
- return $js;
39
- }
40
-
41
- /**
42
- * Creates a json property.
43
- *
44
- * @param string $key
45
- * @param string $label
46
- * @param boolean $isFirst
47
- * Tells if the label is the first in the list.
48
- * @return string
49
- */
50
- protected function _addJSLocaleLabel($key, $label, $isFirst = false) {
51
- $labelProperty = '';
52
-
53
- if (! $isFirst) {
54
- $labelProperty .= ',';
55
- }
56
-
57
- $labelProperty .= $key . ':"' . $label . '"';
58
-
59
- return $labelProperty;
60
- }
61
- public function getExtensionVersion() {
62
- return ( string ) Mage::getConfig ()->getModuleConfig ( 'Dhl_MeinPaketCommon' )->version;
63
- }
64
  const STORE_VIEW_CONFIG = 'meinpaket/store/view';
65
  private $_meinpaketStore = null;
66
  private $_meinpaketRootCategory = null;
 
 
 
67
  public function getMeinPaketStore() {
68
  if ($this->_meinpaketStore == null) {
69
  $this->_meinpaketStore = Mage::app ()->getStore ( Mage::getStoreConfig ( self::STORE_VIEW_CONFIG ) );
@@ -102,27 +52,27 @@ class Dhl_MeinPaketCommon_Helper_Data extends Mage_Core_Helper_Abstract {
102
  }
103
 
104
  /**
105
- * Get filtered quote from session.
106
  *
107
  * @return boolean
108
  */
109
- public function checkItem(Mage_Sales_Model_Order_Item $item) {
110
- $options = Mage::helper ( 'catalog/product_configuration' )->getCustomOptions ( $item );
111
- // $options = $item->getProduct ()->getTypeInstance ( true )->getOrderOptions ( $item->getProduct () );
112
-
113
- if (count ( $options ) || $item->getIsNominal () || $item->getIsVirtual () || $item->getIsRecurring ()) {
114
- return false;
115
- }
116
- // Mage::log ( Zend_Debug::dump ( $options ) );
117
-
118
- if ($item->getParentItemId ()) {
119
- true;
120
- }
121
-
122
- if ($item->getProduct ()->isVirtual () || $item->getProduct ()->isRecurring ()) {
123
- return false;
124
  }
125
 
126
- return true;
127
  }
128
  }
8
  * @subpackage Helper
9
  */
10
  class Dhl_MeinPaketCommon_Helper_Data extends Mage_Core_Helper_Abstract {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
11
  const STORE_VIEW_CONFIG = 'meinpaket/store/view';
12
  private $_meinpaketStore = null;
13
  private $_meinpaketRootCategory = null;
14
+ public function getExtensionVersion() {
15
+ return ( string ) Mage::getConfig ()->getModuleConfig ( 'Dhl_MeinPaketCommon' )->version;
16
+ }
17
  public function getMeinPaketStore() {
18
  if ($this->_meinpaketStore == null) {
19
  $this->_meinpaketStore = Mage::app ()->getStore ( Mage::getStoreConfig ( self::STORE_VIEW_CONFIG ) );
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/Order.php CHANGED
@@ -10,7 +10,7 @@
10
  */
11
  class Dhl_MeinPaketCommon_Helper_Order extends Mage_Core_Helper_Abstract {
12
  /**
13
- * Tells if the given order is an order that was imported from MeinPaket.de.
14
  *
15
  * @param Mage_Sales_Model_Order $order
16
  * @return boolean
10
  */
11
  class Dhl_MeinPaketCommon_Helper_Order extends Mage_Core_Helper_Abstract {
12
  /**
13
+ * Tells if the given order is an order that was imported from Allyouneed.
14
  *
15
  * @param Mage_Sales_Model_Order $order
16
  * @return boolean
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,22 +298,22 @@ 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' );
280
  break;
281
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_INVALID_MODIFICATION :
282
- $description = $this->__ ( 'Ivalid modification of element' );
283
  break;
284
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_NO_CATEGORIZATION :
285
  $description = $this->__ ( 'The product is not mapped to neither a marketplace nor a shop category' );
@@ -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' );
314
  break;
315
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_INVALID_MODIFICATION :
316
+ $description = $this->__ ( 'Invalid modification of element' );
317
  break;
318
  case Dhl_MeinPaketCommon_Model_Validation_ValidationInterface::ERROR_NO_CATEGORIZATION :
319
  $description = $this->__ ( 'The product is not mapped to neither a marketplace nor a shop category' );
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/Helper/Shipment.php CHANGED
@@ -10,7 +10,7 @@
10
  */
11
  class Dhl_MeinPaketCommon_Helper_Shipment extends Mage_Core_Helper_Abstract {
12
  /**
13
- * Tells if the given order is an order that was imported from MeinPaket.de.
14
  *
15
  * @param Mage_Sales_Model_Order_Shipment $shipment
16
  * to check
10
  */
11
  class Dhl_MeinPaketCommon_Helper_Shipment extends Mage_Core_Helper_Abstract {
12
  /**
13
+ * Tells if the given order is an order that was imported from Allyouneed.
14
  *
15
  * @param Mage_Sales_Model_Order_Shipment $shipment
16
  * to check
app/code/community/Dhl/MeinPaketCommon/Model/Carrier/Allyouneed.php ADDED
@@ -0,0 +1,111 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ /**
4
+ * Shipping model which handles the import of orders from DHL MeinPaket.
5
+ *
6
+ * @category Dhl
7
+ * @package Dhl_MeinPaket
8
+ * @subpackage Model
9
+ */
10
+ class Dhl_MeinPaketCommon_Model_Carrier_Allyouneed extends Mage_Shipping_Model_Carrier_Abstract implements Mage_Shipping_Model_Carrier_Interface {
11
+ /**
12
+ *
13
+ * @var string
14
+ */
15
+ protected $_code = 'allyouneed';
16
+
17
+ /**
18
+ *
19
+ * @var float
20
+ */
21
+ protected static $_deliveryCosts = 0.0;
22
+
23
+ /**
24
+ * Tells if the carrier is locked for use.
25
+ *
26
+ * @var boolean
27
+ */
28
+ protected static $_isLocked = true;
29
+
30
+ /**
31
+ * Locks the carrier for use.
32
+ *
33
+ * @return void
34
+ */
35
+ public static function lock() {
36
+ self::$_isLocked = true;
37
+ }
38
+
39
+ /**
40
+ * Unlocks the carrier for use.
41
+ *
42
+ * @return void
43
+ */
44
+ public static function unlock() {
45
+ self::$_isLocked = false;
46
+ }
47
+
48
+ /**
49
+ * Returns the allowed methods for this carrier.
50
+ *
51
+ * @see Mage_Shipping_Model_Carrier_Interface::getAllowedMethods()
52
+ * @return array
53
+ */
54
+ public function getAllowedMethods() {
55
+ return array (
56
+ 'standard' => 'Allyouneed',
57
+ 'method1' => 'Allyouneed'
58
+ );
59
+ }
60
+
61
+ /**
62
+ * Tells if tracking of this shipment is available.
63
+ *
64
+ * @see Mage_Shipping_Model_Carrier_Abstract::isTrackingAvailable()
65
+ * @return boolean Will always return false
66
+ */
67
+ public function isTrackingAvailable() {
68
+ return false;
69
+ }
70
+
71
+ /**
72
+ * Collect the rates.
73
+ *
74
+ * @see Mage_Shipping_Model_Carrier_Abstract::collectRates()
75
+ * @param Mage_Shipping_Model_Rate_Request $request
76
+ * @return Mage_Shipping_Model_Rate_Result
77
+ */
78
+ public function collectRates(Mage_Shipping_Model_Rate_Request $request) {
79
+ // avoid usage as a general carrier method
80
+ if (self::$_isLocked) {
81
+ return false;
82
+ }
83
+
84
+ /* @var $result Mage_Shipping_Model_Rate_Result */
85
+ $result = Mage::getModel ( 'shipping/rate_result' );
86
+
87
+ /* @var $method Mage_Shipping_Model_Rate_Result_Method */
88
+ $method = Mage::getModel ( 'shipping/rate_result_method' );
89
+
90
+ $method->setCarrier ( $this->_code );
91
+ $method->setCarrierTitle ( $this->getConfigData ( 'title' ) );
92
+ $method->setMethod ( 'method' );
93
+ $method->setMethodTitle ( 'Allyouneed' );
94
+
95
+ $method->setPrice ( self::$_deliveryCosts );
96
+
97
+ $result->append ( $method );
98
+
99
+ return $result;
100
+ }
101
+
102
+ /**
103
+ * Sets the total delivery costs
104
+ *
105
+ * @param float $deliveryCosts
106
+ * @return void
107
+ */
108
+ public static function setDeliveryCosts($deliveryCosts) {
109
+ self::$_deliveryCosts = ( float ) $deliveryCosts;
110
+ }
111
+ }
app/code/community/Dhl/MeinPaketCommon/Model/Carrier/Meinpaket.php CHANGED
@@ -68,6 +68,18 @@ class Dhl_MeinPaketCommon_Model_Carrier_Meinpaket extends Mage_Shipping_Model_Ca
68
  return false;
69
  }
70
 
 
 
 
 
 
 
 
 
 
 
 
 
71
  /**
72
  * Collect the rates.
73
  *
68
  return false;
69
  }
70
 
71
+
72
+ /**
73
+ * Determine whether current carrier enabled for activity
74
+ *
75
+ * @return bool
76
+ */
77
+ public function isActive()
78
+ {
79
+ return false;
80
+ }
81
+
82
+
83
  /**
84
  * Collect the rates.
85
  *
app/code/community/Dhl/MeinPaketCommon/Model/Client/XmlOverHttp.php CHANGED
@@ -14,13 +14,13 @@ class Dhl_MeinPaketCommon_Model_Client_XmlOverHttp extends Varien_Object {
14
  *
15
  * @var string
16
  */
17
- const PRODUCTIVE_ENDPOINT = 'www.meinpaket.de/dealerapi/xml';
18
  /**
19
  * Endpoint for sandbox
20
  *
21
  * @var string
22
  */
23
- const SANDBOX_ENDPOINT = 'mp-api.mepa-home.de/dealerapi/xml';
24
  /**
25
  * Suffix for async requests
26
  *
@@ -49,7 +49,8 @@ class Dhl_MeinPaketCommon_Model_Client_XmlOverHttp extends Varien_Object {
49
  */
50
  public function __construct() {
51
  $this->config = array (
52
- 'useragent' => 'Magento ' . Mage::getVersion () . ' Extension ' . Mage::helper ( 'meinpaket/data' )->getExtensionVersion ()
 
53
  );
54
  $scheme = Mage::getStoreConfigFlag ( 'meinpaket/endpoint/https' ) ? 'https://' : 'http://';
55
  $path = Mage::getStoreConfigFlag ( 'meinpaket/endpoint/sandbox' ) ? self::SANDBOX_ENDPOINT : self::PRODUCTIVE_ENDPOINT;
@@ -94,6 +95,7 @@ class Dhl_MeinPaketCommon_Model_Client_XmlOverHttp extends Varien_Object {
94
 
95
  /* @var $log Dhl_MeinPaketCommon_Model_Log */
96
  $log = Mage::getModel ( 'meinpaketcommon/log' );
 
97
  $log->setSend ( $xmlData );
98
  $log->setCreatedAt ( Varien_Date::now () );
99
  if ($xml instanceof Dhl_MeinPaketCommon_Model_Xml_Request_AsynchronousStatusRequest) {
@@ -120,7 +122,7 @@ class Dhl_MeinPaketCommon_Model_Client_XmlOverHttp extends Varien_Object {
120
  $log->setReceived ( $body4Mysql );
121
  $status = $serverResponse->getStatus ();
122
 
123
- Mage::log ( $status + "\n" + $body, 'meinpaket.log' );
124
 
125
  if ($status !== 200) {
126
  $log->setError ( 'FAILURE: Client returned HTTP return code "' . $status . '".' );
14
  *
15
  * @var string
16
  */
17
+ const PRODUCTIVE_ENDPOINT = 'de.allyouneed.com/dealerapi/xml';
18
  /**
19
  * Endpoint for sandbox
20
  *
21
  * @var string
22
  */
23
+ const SANDBOX_ENDPOINT = 'ayn-api.mepa-home.de/dealerapi/xml';
24
  /**
25
  * Suffix for async requests
26
  *
49
  */
50
  public function __construct() {
51
  $this->config = array (
52
+ 'useragent' => 'Magento ' . Mage::getVersion () . ' Extension ' . Mage::helper ( 'meinpaket/data' )->getExtensionVersion (),
53
+ 'timeout' => 30
54
  );
55
  $scheme = Mage::getStoreConfigFlag ( 'meinpaket/endpoint/https' ) ? 'https://' : 'http://';
56
  $path = Mage::getStoreConfigFlag ( 'meinpaket/endpoint/sandbox' ) ? self::SANDBOX_ENDPOINT : self::PRODUCTIVE_ENDPOINT;
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) {
122
  $log->setReceived ( $body4Mysql );
123
  $status = $serverResponse->getStatus ();
124
 
125
+ Mage::log ( $status . "\n" . $body, 'meinpaket.log' );
126
 
127
  if ($status !== 200) {
128
  $log->setError ( 'FAILURE: Client returned HTTP return code "' . $status . '".' );
app/code/community/Dhl/MeinPaketCommon/Model/Cron.php CHANGED
@@ -24,7 +24,7 @@ class Dhl_MeinPaketCommon_Model_Cron {
24
  */
25
  public function importOrders() {
26
  try {
27
- return Mage::getSingleton ( 'meinpaket/service_order_importService' )->importOrders ();
28
  } catch ( Exception $e ) {
29
  Mage::logException ( $e );
30
  }
@@ -38,7 +38,7 @@ class Dhl_MeinPaketCommon_Model_Cron {
38
  */
39
  public function processAsyncTasks() {
40
  try {
41
- return Mage::getSingleton ( 'meinpaket/service_async' )->process ();
42
  } catch ( Exception $e ) {
43
  Mage::logException ( $e );
44
  }
24
  */
25
  public function importOrders() {
26
  try {
27
+ return Mage::getSingleton ( 'meinpaketcommon/service_order_importService' )->importOrders ();
28
  } catch ( Exception $e ) {
29
  Mage::logException ( $e );
30
  }
38
  */
39
  public function processAsyncTasks() {
40
  try {
41
+ return Mage::getSingleton ( 'meinpaketcommon/service_async' )->process ();
42
  } catch ( Exception $e ) {
43
  Mage::logException ( $e );
44
  }
app/code/community/Dhl/MeinPaketCommon/Model/Observer.php CHANGED
@@ -53,7 +53,7 @@ class Dhl_MeinPaketCommon_Model_Observer {
53
  /* @var $block Mage_Adminhtml_Block_Sales_Order_Grid */
54
 
55
  $block->addColumnAfter ( 'dhl_mein_paket_order_id', array (
56
- 'header' => __ ( 'MeinPaket.de Order No.' ),
57
  'index' => 'dhl_mein_paket_order_id'
58
  ), 'real_order_id' );
59
  }
@@ -99,7 +99,7 @@ class Dhl_MeinPaketCommon_Model_Observer {
99
  */
100
  protected function _updateMeinPaketOrderId($order) {
101
  // return if the order doesn't have a parent order
102
- // or if it already has a MeinPaket.de order id...
103
  if (! $order->hasData ( 'relation_parent_id' ) || $order->hasData ( 'dhl_mein_paket_order_id' )) {
104
  return;
105
  }
@@ -215,24 +215,24 @@ class Dhl_MeinPaketCommon_Model_Observer {
215
  $errMsg .= $helper->__ ( 'Request could not be built.' );
216
  } catch ( Dhl_MeinPaketCommon_Model_Client_BadHttpReturnCodeException $e ) {
217
  Mage::logException ( $e );
218
- $errMsg .= sprintf ( $helper->__ ( 'MeinPaket.de server returned HTPP code %s.' ), $e->getHttpReturnCode () );
219
  } catch ( Dhl_MeinPaketCommon_Model_Client_HttpTimeoutException $e ) {
220
  Mage::logException ( $e );
221
- $errMsg .= $helper->__ ( 'Connection to MeinPaket.de server timed out.' );
222
  } catch ( Dhl_MeinPaketCommon_Model_Xml_InvalidXmlException $e ) {
223
  Mage::logException ( $e );
224
- $errMsg .= $helper->__ ( 'Invalid response from MeinPaket.de server.' );
225
  } catch ( Exception $e ) {
226
  Mage::logException ( $e );
227
  $errMsg .= $helper->__ ( 'Unknown error.' );
228
  }
229
  if (is_object ( $result ) && $result->hasError ()) {
230
- $errMsg .= sprintf ( $helper->__ ( 'MeinPaket.de server returned error code %s.' ), $result->getError () );
231
  }
232
 
233
  if (strlen ( $errMsg ) > 0) {
234
- Mage::getSingleton ( 'adminhtml/session' )->addError ( $helper->__ ( 'Error on tranfering cancelled items to MeinPaket.de.' ) . ' (' . $errMsg . ')' );
235
- throw new Exception ( 'Failed transfering cancelled items to MeinPaket.de server.' );
236
  }
237
  }
238
  }
@@ -241,7 +241,7 @@ class Dhl_MeinPaketCommon_Model_Observer {
241
  }
242
 
243
  /**
244
- * Cancels the given order in MeinPaket.de if the given order is a MeinPaket.de order
245
  * and its state is Mage_Sales_Model_Order::STATE_CANCELED.
246
  *
247
  * @param Mage_Sales_Model_Order $order
@@ -274,24 +274,24 @@ class Dhl_MeinPaketCommon_Model_Observer {
274
  $errMsg .= $helper->__ ( 'Request could not be built.' );
275
  } catch ( Dhl_MeinPaketCommon_Model_Client_BadHttpReturnCodeException $e ) {
276
  Mage::logException ( $e );
277
- $errMsg .= sprintf ( $helper->__ ( 'MeinPaket.de server returned HTPP code %s.' ), $e->getHttpReturnCode () );
278
  } catch ( Dhl_MeinPaketCommon_Model_Client_HttpTimeoutException $e ) {
279
  Mage::logException ( $e );
280
- $errMsg .= $helper->__ ( 'Connection to MeinPaket.de server timed out.' );
281
  } catch ( Dhl_MeinPaketCommon_Model_Xml_InvalidXmlException $e ) {
282
  Mage::logException ( $e );
283
- $errMsg .= $helper->__ ( 'Invalid response from MeinPaket.de server.' );
284
  } catch ( Exception $e ) {
285
  Mage::logException ( $e );
286
  $errMsg .= $helper->__ ( 'Unknown error.' );
287
  }
288
  if (is_object ( $result ) && $result->hasError ()) {
289
- $errMsg .= sprintf ( $helper->__ ( 'MeinPaket.de server returned error code %s.' ), $result->getError () );
290
  }
291
 
292
  if (strlen ( $errMsg ) > 0) {
293
- Mage::getSingleton ( 'adminhtml/session' )->addError ( $helper->__ ( 'Error on tranfering cancelled items to MeinPaket.de.' ) . ' (' . $errMsg . ')' );
294
- throw new Exception ( 'Failed transfering cancelled items to MeinPaket.de server.' );
295
  }
296
  }
297
 
@@ -358,7 +358,7 @@ class Dhl_MeinPaketCommon_Model_Observer {
358
  }
359
 
360
  /**
361
- * Exports an saved shipment to MeinPaket.de.
362
  *
363
  * @param Mage_Sales_Model_Order_Shipment $shipment
364
  * @return Dhl_MeinPaketCommon_Model_Observer
@@ -377,25 +377,25 @@ class Dhl_MeinPaketCommon_Model_Observer {
377
  $errMsg .= $helper->__ ( 'Request could not be built.' );
378
  } catch ( Dhl_MeinPaketCommon_Model_Client_BadHttpReturnCodeException $e ) {
379
  Mage::logException ( $e );
380
- $errMsg .= sprintf ( $helper->__ ( 'MeinPaket.de server returned HTPP code %s.' ), $e->getHttpReturnCode () );
381
  } catch ( Dhl_MeinPaketCommon_Model_Client_HttpTimeoutException $e ) {
382
  Mage::logException ( $e );
383
- $errMsg .= $helper->__ ( 'Connection to MeinPaket.de server timed out.' );
384
  } catch ( Dhl_MeinPaketCommon_Model_Xml_InvalidXmlException $e ) {
385
  Mage::logException ( $e );
386
- $errMsg .= $helper->__ ( 'Invalid response from MeinPaket.de server.' );
387
  } catch ( Exception $e ) {
388
  Mage::logException ( $e );
389
  $errMsg .= $helper->__ ( 'Unknown error.' );
390
  }
391
 
392
  if ($result == null || $result->hasErrors ()) {
393
- $errMsg .= $helper->__ ( 'Shipment has not been accepted by MeinPaket.de.' );
394
  }
395
 
396
  if (strlen ( $errMsg ) > 0) {
397
- Mage::getSingleton ( 'adminhtml/session' )->addError ( $helper->__ ( 'Error on transfering shipment to MeinPaket.de.' ) . ' (' . $errMsg . ')' );
398
- throw new Exception ( 'Failed exporting shipment to MeinPaket.de server.' );
399
  }
400
 
401
  return $this;
@@ -403,7 +403,7 @@ class Dhl_MeinPaketCommon_Model_Observer {
403
 
404
  /**
405
  * Is called when a creditmemo is saved.
406
- * If the creditmemo is refunded, a notification will be send to MeinPaket.de.
407
  *
408
  * @param Varien_Event_Observer $observer
409
  * @return Dhl_MeinPaketCommon_Model_Observer
@@ -419,7 +419,7 @@ class Dhl_MeinPaketCommon_Model_Observer {
419
  return $this;
420
  }
421
 
422
- // check if the order is a MeinPaket.de order
423
  if (! Mage::helper ( 'meinpaketcommon/order' )->isMeinPaketOrder ( $creditmemo->getOrder () )) {
424
  return $this;
425
  }
@@ -440,25 +440,25 @@ class Dhl_MeinPaketCommon_Model_Observer {
440
  $errMsg .= $helper->__ ( 'Request could not be built.' );
441
  } catch ( Dhl_MeinPaketCommon_Model_Client_BadHttpReturnCodeException $e ) {
442
  Mage::logException ( $e );
443
- $errMsg .= sprintf ( $helper->__ ( 'MeinPaket.de server returned HTPP code %s.' ), $e->getHttpReturnCode () );
444
  } catch ( Dhl_MeinPaketCommon_Model_Client_HttpTimeoutException $e ) {
445
  Mage::logException ( $e );
446
- $errMsg .= $helper->__ ( 'Connection to MeinPaket.de server timed out.' );
447
  } catch ( Dhl_MeinPaketCommon_Model_Xml_InvalidXmlException $e ) {
448
  Mage::logException ( $e );
449
- $errMsg .= $helper->__ ( 'Invalid response from MeinPaket.de server.' );
450
  } catch ( Exception $e ) {
451
  Mage::logException ( $e );
452
  $errMsg .= $helper->__ ( 'Unknown error.' );
453
  }
454
 
455
  if ($result == null) {
456
- $errMsg .= $helper->__ ( 'Refund has not been accepted by MeinPaket.de.' );
457
  }
458
 
459
  if (strlen ( $errMsg ) > 0) {
460
- Mage::getSingleton ( 'adminhtml/session' )->addError ( $helper->__ ( 'Error on transfering refund to MeinPaket.de.' ) . ' (' . $errMsg . ')' );
461
- throw new Exception ( 'Failed exporting refund to MeinPaket.de server.' );
462
  }
463
 
464
  return $this;
@@ -466,7 +466,7 @@ class Dhl_MeinPaketCommon_Model_Observer {
466
 
467
  /**
468
  * Is called when a shipment track is saved.
469
- * The tracking code will be sent to MeinPaket.de if it's the first track
470
  * for the shipment.
471
  *
472
  * @param Varien_Event_Observer $observer
@@ -489,7 +489,7 @@ class Dhl_MeinPaketCommon_Model_Observer {
489
  /* @var $shipment Mage_Sales_Model_Order_Shipment */
490
  $shipment = $track->getShipment ();
491
 
492
- // check if order is a MeinPaket.de order...
493
  if (! Mage::helper ( 'meinpaketcommon/shipment' )->isMeinPaketShipment ( $shipment )) {
494
  return $this;
495
  }
@@ -507,28 +507,28 @@ class Dhl_MeinPaketCommon_Model_Observer {
507
  $errMsg .= $helper->__ ( 'Request could not be built.' );
508
  } catch ( Dhl_MeinPaketCommon_Model_Client_BadHttpReturnCodeException $e ) {
509
  Mage::logException ( $e );
510
- $errMsg .= sprintf ( $helper->__ ( 'MeinPaket.de server returned HTPP code %s.' ), $e->getHttpReturnCode () );
511
  } catch ( Dhl_MeinPaketCommon_Model_Client_HttpTimeoutException $e ) {
512
  Mage::logException ( $e );
513
- $errMsg .= $helper->__ ( 'Connection to MeinPaket.de server timed out.' );
514
  } catch ( Dhl_MeinPaketCommon_Model_Xml_InvalidXmlException $e ) {
515
  Mage::logException ( $e );
516
- $errMsg .= $helper->__ ( 'Invalid response from MeinPaket.de server.' );
517
  } catch ( Exception $e ) {
518
  Mage::logException ( $e );
519
  $errMsg .= $helper->__ ( 'Unknown error.' );
520
  }
521
 
522
  if ($result !== null && ! $result->hasBeenAccepted ()) {
523
- $errMsg .= $helper->__ ( 'Tracking code has not been accepted by MeinPaket.de.' );
524
  if ($result->hasError ()) {
525
- $errMsg .= ' (' . sprintf ( $helper->__ ( 'MeinPaket.de returned error code %s.' ), $result->getError () ) . ')';
526
  }
527
  }
528
 
529
  if (strlen ( $errMsg ) > 0) {
530
- Mage::getSingleton ( 'adminhtml/session' )->addError ( $helper->__ ( 'Error on transfering tracking code to MeinPaket.de.' ) . ' (' . $errMsg . ')' );
531
- throw new Exception ( 'Failed exporting tracking code to MeinPaket.de server.' );
532
  }
533
 
534
  return $this;
53
  /* @var $block Mage_Adminhtml_Block_Sales_Order_Grid */
54
 
55
  $block->addColumnAfter ( 'dhl_mein_paket_order_id', array (
56
+ 'header' => __ ( 'Allyouneed Order No.' ),
57
  'index' => 'dhl_mein_paket_order_id'
58
  ), 'real_order_id' );
59
  }
99
  */
100
  protected function _updateMeinPaketOrderId($order) {
101
  // return if the order doesn't have a parent order
102
+ // or if it already has a Allyouneed order id...
103
  if (! $order->hasData ( 'relation_parent_id' ) || $order->hasData ( 'dhl_mein_paket_order_id' )) {
104
  return;
105
  }
215
  $errMsg .= $helper->__ ( 'Request could not be built.' );
216
  } catch ( Dhl_MeinPaketCommon_Model_Client_BadHttpReturnCodeException $e ) {
217
  Mage::logException ( $e );
218
+ $errMsg .= sprintf ( $helper->__ ( 'Allyouneed server returned HTPP code %s.' ), $e->getHttpReturnCode () );
219
  } catch ( Dhl_MeinPaketCommon_Model_Client_HttpTimeoutException $e ) {
220
  Mage::logException ( $e );
221
+ $errMsg .= $helper->__ ( 'Connection to Allyouneed server timed out.' );
222
  } catch ( Dhl_MeinPaketCommon_Model_Xml_InvalidXmlException $e ) {
223
  Mage::logException ( $e );
224
+ $errMsg .= $helper->__ ( 'Invalid response from Allyouneed server.' );
225
  } catch ( Exception $e ) {
226
  Mage::logException ( $e );
227
  $errMsg .= $helper->__ ( 'Unknown error.' );
228
  }
229
  if (is_object ( $result ) && $result->hasError ()) {
230
+ $errMsg .= sprintf ( $helper->__ ( 'Allyouneed server returned error code %s.' ), $result->getError () );
231
  }
232
 
233
  if (strlen ( $errMsg ) > 0) {
234
+ Mage::getSingleton ( 'adminhtml/session' )->addError ( $helper->__ ( 'Error on tranfering cancelled items to Allyouneed.' ) . ' (' . $errMsg . ')' );
235
+ throw new Exception ( 'Failed transfering cancelled items to Allyouneed server.' );
236
  }
237
  }
238
  }
241
  }
242
 
243
  /**
244
+ * Cancels the given order in Allyouneed if the given order is a Allyouneed order
245
  * and its state is Mage_Sales_Model_Order::STATE_CANCELED.
246
  *
247
  * @param Mage_Sales_Model_Order $order
274
  $errMsg .= $helper->__ ( 'Request could not be built.' );
275
  } catch ( Dhl_MeinPaketCommon_Model_Client_BadHttpReturnCodeException $e ) {
276
  Mage::logException ( $e );
277
+ $errMsg .= sprintf ( $helper->__ ( 'Allyouneed server returned HTPP code %s.' ), $e->getHttpReturnCode () );
278
  } catch ( Dhl_MeinPaketCommon_Model_Client_HttpTimeoutException $e ) {
279
  Mage::logException ( $e );
280
+ $errMsg .= $helper->__ ( 'Connection to Allyouneed server timed out.' );
281
  } catch ( Dhl_MeinPaketCommon_Model_Xml_InvalidXmlException $e ) {
282
  Mage::logException ( $e );
283
+ $errMsg .= $helper->__ ( 'Invalid response from Allyouneed server.' );
284
  } catch ( Exception $e ) {
285
  Mage::logException ( $e );
286
  $errMsg .= $helper->__ ( 'Unknown error.' );
287
  }
288
  if (is_object ( $result ) && $result->hasError ()) {
289
+ $errMsg .= sprintf ( $helper->__ ( 'Allyouneed server returned error code %s.' ), $result->getError () );
290
  }
291
 
292
  if (strlen ( $errMsg ) > 0) {
293
+ Mage::getSingleton ( 'adminhtml/session' )->addError ( $helper->__ ( 'Error on tranfering cancelled items to Allyouneed.' ) . ' (' . $errMsg . ')' );
294
+ throw new Exception ( 'Failed transfering cancelled items to Allyouneed server.' );
295
  }
296
  }
297
 
358
  }
359
 
360
  /**
361
+ * Exports an saved shipment to Allyouneed.
362
  *
363
  * @param Mage_Sales_Model_Order_Shipment $shipment
364
  * @return Dhl_MeinPaketCommon_Model_Observer
377
  $errMsg .= $helper->__ ( 'Request could not be built.' );
378
  } catch ( Dhl_MeinPaketCommon_Model_Client_BadHttpReturnCodeException $e ) {
379
  Mage::logException ( $e );
380
+ $errMsg .= sprintf ( $helper->__ ( 'Allyouneed server returned HTPP code %s.' ), $e->getHttpReturnCode () );
381
  } catch ( Dhl_MeinPaketCommon_Model_Client_HttpTimeoutException $e ) {
382
  Mage::logException ( $e );
383
+ $errMsg .= $helper->__ ( 'Connection to Allyouneed server timed out.' );
384
  } catch ( Dhl_MeinPaketCommon_Model_Xml_InvalidXmlException $e ) {
385
  Mage::logException ( $e );
386
+ $errMsg .= $helper->__ ( 'Invalid response from Allyouneed server.' );
387
  } catch ( Exception $e ) {
388
  Mage::logException ( $e );
389
  $errMsg .= $helper->__ ( 'Unknown error.' );
390
  }
391
 
392
  if ($result == null || $result->hasErrors ()) {
393
+ $errMsg .= $helper->__ ( 'Shipment has not been accepted by Allyouneed.' );
394
  }
395
 
396
  if (strlen ( $errMsg ) > 0) {
397
+ Mage::getSingleton ( 'adminhtml/session' )->addError ( $helper->__ ( 'Error on transfering shipment to Allyouneed.' ) . ' (' . $errMsg . ')' );
398
+ throw new Exception ( 'Failed exporting shipment to Allyouneed server.' );
399
  }
400
 
401
  return $this;
403
 
404
  /**
405
  * Is called when a creditmemo is saved.
406
+ * If the creditmemo is refunded, a notification will be send to Allyouneed.
407
  *
408
  * @param Varien_Event_Observer $observer
409
  * @return Dhl_MeinPaketCommon_Model_Observer
419
  return $this;
420
  }
421
 
422
+ // check if the order is a Allyouneed order
423
  if (! Mage::helper ( 'meinpaketcommon/order' )->isMeinPaketOrder ( $creditmemo->getOrder () )) {
424
  return $this;
425
  }
440
  $errMsg .= $helper->__ ( 'Request could not be built.' );
441
  } catch ( Dhl_MeinPaketCommon_Model_Client_BadHttpReturnCodeException $e ) {
442
  Mage::logException ( $e );
443
+ $errMsg .= sprintf ( $helper->__ ( 'Allyouneed server returned HTPP code %s.' ), $e->getHttpReturnCode () );
444
  } catch ( Dhl_MeinPaketCommon_Model_Client_HttpTimeoutException $e ) {
445
  Mage::logException ( $e );
446
+ $errMsg .= $helper->__ ( 'Connection to Allyouneed server timed out.' );
447
  } catch ( Dhl_MeinPaketCommon_Model_Xml_InvalidXmlException $e ) {
448
  Mage::logException ( $e );
449
+ $errMsg .= $helper->__ ( 'Invalid response from Allyouneed server.' );
450
  } catch ( Exception $e ) {
451
  Mage::logException ( $e );
452
  $errMsg .= $helper->__ ( 'Unknown error.' );
453
  }
454
 
455
  if ($result == null) {
456
+ $errMsg .= $helper->__ ( 'Refund has not been accepted by Allyouneed.' );
457
  }
458
 
459
  if (strlen ( $errMsg ) > 0) {
460
+ Mage::getSingleton ( 'adminhtml/session' )->addError ( $helper->__ ( 'Error on transfering refund to Allyouneed.' ) . ' (' . $errMsg . ')' );
461
+ throw new Exception ( 'Failed exporting refund to Allyouneed server.' );
462
  }
463
 
464
  return $this;
466
 
467
  /**
468
  * Is called when a shipment track is saved.
469
+ * The tracking code will be sent to Allyouneed if it's the first track
470
  * for the shipment.
471
  *
472
  * @param Varien_Event_Observer $observer
489
  /* @var $shipment Mage_Sales_Model_Order_Shipment */
490
  $shipment = $track->getShipment ();
491
 
492
+ // check if order is a Allyouneed order...
493
  if (! Mage::helper ( 'meinpaketcommon/shipment' )->isMeinPaketShipment ( $shipment )) {
494
  return $this;
495
  }
507
  $errMsg .= $helper->__ ( 'Request could not be built.' );
508
  } catch ( Dhl_MeinPaketCommon_Model_Client_BadHttpReturnCodeException $e ) {
509
  Mage::logException ( $e );
510
+ $errMsg .= sprintf ( $helper->__ ( 'Allyouneed server returned HTPP code %s.' ), $e->getHttpReturnCode () );
511
  } catch ( Dhl_MeinPaketCommon_Model_Client_HttpTimeoutException $e ) {
512
  Mage::logException ( $e );
513
+ $errMsg .= $helper->__ ( 'Connection to Allyouneed server timed out.' );
514
  } catch ( Dhl_MeinPaketCommon_Model_Xml_InvalidXmlException $e ) {
515
  Mage::logException ( $e );
516
+ $errMsg .= $helper->__ ( 'Invalid response from Allyouneed server.' );
517
  } catch ( Exception $e ) {
518
  Mage::logException ( $e );
519
  $errMsg .= $helper->__ ( 'Unknown error.' );
520
  }
521
 
522
  if ($result !== null && ! $result->hasBeenAccepted ()) {
523
+ $errMsg .= $helper->__ ( 'Tracking code has not been accepted by Allyouneed.' );
524
  if ($result->hasError ()) {
525
+ $errMsg .= ' (' . sprintf ( $helper->__ ( 'Allyouneed returned error code %s.' ), $result->getError () ) . ')';
526
  }
527
  }
528
 
529
  if (strlen ( $errMsg ) > 0) {
530
+ Mage::getSingleton ( 'adminhtml/session' )->addError ( $helper->__ ( 'Error on transfering tracking code to Allyouneed.' ) . ' (' . $errMsg . ')' );
531
+ throw new Exception ( 'Failed exporting tracking code to Allyouneed server.' );
532
  }
533
 
534
  return $this;
app/code/community/Dhl/MeinPaketCommon/Model/Payment/Method/Allyouneed.php ADDED
@@ -0,0 +1,29 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ /**
4
+ * MeinPaket payment method for imported orders.
5
+ *
6
+ * @category Mage
7
+ * @package Dhl_MeinPaket
8
+ * @subpackage Payment_Method
9
+ */
10
+ class Dhl_MeinPaketCommon_Model_Payment_Method_Allyouneed extends Mage_Payment_Model_Method_Abstract {
11
+ /**
12
+ *
13
+ * @var string
14
+ */
15
+ protected $_code = 'allyouneed';
16
+
17
+ /**
18
+ * Can use this payment method in administration panel?
19
+ * @var boolean
20
+ */
21
+ protected $_canUseInternal = false;
22
+
23
+ /**
24
+ * Can show this payment method as an option on checkout payment page?
25
+ * @var boolean
26
+ */
27
+ protected $_canUseCheckout = false;
28
+
29
+ }
app/code/community/Dhl/MeinPaketCommon/Model/Resource/Eav/Mysql4/Setup.php CHANGED
@@ -1,53 +1,3 @@
1
  <?php
2
  class Dhl_MeinPaketCommon_Model_Resource_Eav_Mysql4_Setup extends Mage_Catalog_Model_Resource_Setup {
3
- /**
4
- *
5
- * @return array
6
- */
7
- public function getDefaultEntities() {
8
- return array (
9
- 'order' => array (
10
- 'entity_model' => 'sales/order',
11
- 'table' => 'sales/order',
12
- 'increment_model' => 'eav/entity_increment_numeric',
13
- 'increment_per_store' => true,
14
- 'backend_prefix' => 'sales_entity/order_attribute_backend',
15
- 'attributes' => array (
16
- 'meinpaket_id' => array (
17
- 'type' => 'int',
18
- 'label' => 'Order MeinPaket Id',
19
- 'required' => false,
20
- 'is_visible' => false,
21
- 'visible' => false
22
- )
23
- )
24
- ),
25
- 'customer' => array (
26
- 'entity_model' => 'customer/customer',
27
- 'attribute_model' => 'customer/attribute',
28
- 'table' => 'customer/entity',
29
- 'increment_model' => 'eav/entity_increment_numeric',
30
- 'additional_attribute_table' => 'customer/eav_attribute',
31
- 'entity_attribute_collection' => 'customer/attribute_collection',
32
- 'attributes' => array (
33
- 'meinpaket_buyer_id' => array (
34
- 'type' => 'int',
35
- 'label' => 'MeinPaket Buyer Id',
36
- 'input' => 'text',
37
- 'required' => false,
38
- 'sort_order' => 200,
39
- 'visible' => false
40
- ),
41
- 'meinpaket_buyer_name' => array (
42
- 'type' => 'varchar',
43
- 'label' => 'MeinPaket Buyer Name',
44
- 'input' => 'text',
45
- 'required' => false,
46
- 'sort_order' => 201,
47
- 'visible' => false
48
- )
49
- )
50
- )
51
- );
52
- }
53
  }
1
  <?php
2
  class Dhl_MeinPaketCommon_Model_Resource_Eav_Mysql4_Setup extends Mage_Catalog_Model_Resource_Setup {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3
  }
app/code/community/Dhl/MeinPaketCommon/Model/Service/Order/CancellationService/Result.php CHANGED
@@ -45,7 +45,7 @@ class Dhl_MeinPaketCommon_Model_Service_Order_CancellationService_Result extends
45
  *
46
  * @param string $errorCode
47
  * has to be the errorCode
48
- * that was returned from the MeinPaket.de
49
  * webservice.
50
  * @return void
51
  */
@@ -83,7 +83,7 @@ class Dhl_MeinPaketCommon_Model_Service_Order_CancellationService_Result extends
83
  }
84
 
85
  /**
86
- * Returns all consignment ids that have been returned by MeinPaket.de.
87
  *
88
  * @return array
89
  */
45
  *
46
  * @param string $errorCode
47
  * has to be the errorCode
48
+ * that was returned from the Allyouneed
49
  * webservice.
50
  * @return void
51
  */
83
  }
84
 
85
  /**
86
+ * Returns all consignment ids that have been returned by Allyouneed.
87
  *
88
  * @return array
89
  */
app/code/community/Dhl/MeinPaketCommon/Model/Service/Order/ImportService.php CHANGED
@@ -34,13 +34,13 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
34
  *
35
  * @var string
36
  */
37
- const IMPORT_SHIPPING_METHOD = 'meinpaket_standard';
38
 
39
  /**
40
  *
41
  * @var string
42
  */
43
- const IMPORT_PAYMENT_METHOD = 'meinpaket';
44
 
45
  /**
46
  *
@@ -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' );
@@ -223,7 +243,7 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
223
  /* @var $quoteObj Mage_Sales_Model_Quote */
224
  $quoteObj = Mage::getModel ( 'sales/quote' );
225
  $quoteObj->setStoreId ( $storeId );
226
- $quoteObj->setCustomerNote ( __ ( 'Imported from DHL MeinPaket.de' ) . ' (' . __ ( 'Delivery Method' ) . ':' . (( string ) $order->getDeliveryMethod ()) . ')' );
227
  $quoteObj->setCustomerFirstname ( $customer->getFirstname () );
228
  $quoteObj->setCustomerLastname ( $customer->getLastname () );
229
  $quoteObj->setCustomerIsGuest ( Mage::getStoreConfig ( self::USE_GUEST_ACCOUNT_CONFIG ) );
@@ -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 ();
@@ -257,7 +288,7 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
257
  } elseif (( bool ) $stockItem->getData ( 'is_in_stock' )) {
258
 
259
  if (floatval ( $productObj->getPrice () ) != floatval ( $orderEntry->getBasePrice () )) {
260
- $message = sprintf ( __ ( '%s was ordered with a different price (%s instead of current price %s). Was the price changed after exporting to MeinPaket.de?' ), $productObj->getName (), $orderEntry->getBasePrice (), $productObj->getPrice () );
261
  Mage::getSingleton ( 'adminhtml/session' )->addNotice ( $message );
262
  }
263
 
@@ -268,9 +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->getProduct ()->setIsSuperMode ( true );
275
  } else {
276
  Mage::log ( $item );
@@ -298,23 +342,20 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
298
  }
299
  }
300
 
301
- $rate = $this->calculateRate ( $order );
302
-
303
- $billingAddress = $quoteObj->getBillingAddress ();
304
- $billingAddress->addData ( $this->_getAddressData ( $order->getBillingAddress () ) );
305
- $shippingAddress = $quoteObj->getShippingAddress ();
306
- if ($order->getDeliveryAddress () != null) {
307
- $shippingAddress->addData ( $this->_getAddressData ( $order->getDeliveryAddress () ) );
308
  } else {
309
- $shippingAddress->addData ( $this->_getAddressData ( $order->getBillingAddress () ) );
310
  }
311
 
 
 
312
  $shippingAddress->setCollectShippingRates ( false );
313
  $shippingAddress->addShippingRate ( $rate );
314
  $shippingAddress->setShippingMethod ( $rate->getCode () );
315
 
316
- $shippingAddress->setBaseShippingAmount ( $order->getTotalDeliveryCosts () );
317
- $shippingAddress->setShippingAmount ( $order->getTotalDeliveryCosts () );
318
  $shippingAddress->setPaymentMethod ( $paymentMethod );
319
 
320
  $quoteObj->getPayment ()->importData ( array (
@@ -324,9 +365,18 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
324
  // Dhl_MeinPaketCommon_Model_Carrier_Meinpaket::unlock ();
325
  // Dhl_MeinPaketCommon_Model_Carrier_Meinpaket::setDeliveryCosts ( $order->getTotalDeliveryCosts () );
326
 
327
- $quoteObj->collectTotals ();
 
 
 
 
 
 
328
  $quoteObj->save ();
329
 
 
 
 
330
  /* @var $quoteObj Mage_Sales_Model_Service_Quote */
331
  $serviceQuote = Mage::getModel ( 'sales/service_quote', $quoteObj );
332
  $serviceQuote->submitAll ();
@@ -334,7 +384,7 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
334
  /* @var $orderModel Mage_Sales_Model_Order */
335
  $orderModel = $serviceQuote->getOrder ();
336
  /**
337
- * triggert aufruf von authorizes() auf dem payment model (ggf auch capture() )
338
  */
339
 
340
  $contactData = $order->getContactData ();
@@ -424,7 +474,7 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
424
  }
425
 
426
  // Set store and website for loadByEmail.
427
- $customer->setStore ( Mage::helper ( 'meinpaketcommon/data' )->getMeinPaketStore () );
428
  // Could not find customer by meinpaket_buyer_id. As there can only be one customer for a given
429
  // email try to load one.
430
  $customer->loadByEmail ( $order->getContactData ()->getEmail () );
@@ -435,7 +485,7 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
435
 
436
  // New customer
437
  // Set store and website again after loadByEmail reset it.
438
- $customer->setStore ( Mage::helper ( 'meinpaketcommon/data' )->getMeinPaketStore () );
439
  $customer->setFirstname ( $order->getBillingAddress ()->getFirstName () );
440
  $customer->setLastname ( $order->getBillingAddress ()->getLastName () );
441
  $customer->setEmail ( $order->getContactData ()->getEmail () );
@@ -470,15 +520,13 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ImportService extends Varien_Objec
470
  * @return Mage_Sales_Model_Quote_Address_Rate
471
  */
472
  protected function calculateRate(Dhl_MeinPaketCommon_Model_Xml_Response_Partial_Order $order) {
473
- $carrier = Mage::getModel ( 'meinpaketcommon/carrier_meinpaket' );
474
- /* @var $carrier Dhl_MeinPaketCommon_Model_Carrier_Meinpaket */
475
- $methods = $carrier->getAllowedMethods ();
476
  $result = Mage::getModel ( 'sales/quote_address_rate' );
477
  /* @var $result Mage_Sales_Model_Quote_Address_Rate */
478
 
479
- $parts = explode ( "_", self::IMPORT_SHIPPING_METHOD );
480
-
481
- $result->setCarrierTitle ( 'MeinPaket' )->setCode ( self::IMPORT_SHIPPING_METHOD )->setCarrier ( $parts [0] )->setMethod ( 'standard' )->setMethodTitle ( 'MeinPaket' )->setMethodDescription ( 'MeinPaket' )->setCost ( $order->getTotalDeliveryCosts () )->setPrice ( $order->getTotalDeliveryCosts () );
482
 
483
  return $result;
484
  }
34
  *
35
  * @var string
36
  */
37
+ const IMPORT_SHIPPING_METHOD = 'allyouneed_standard';
38
 
39
  /**
40
  *
41
  * @var string
42
  */
43
+ const IMPORT_PAYMENT_METHOD = 'allyouneed';
44
 
45
  /**
46
  *
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' );
243
  /* @var $quoteObj Mage_Sales_Model_Quote */
244
  $quoteObj = Mage::getModel ( 'sales/quote' );
245
  $quoteObj->setStoreId ( $storeId );
246
+ $quoteObj->setCustomerNote ( __ ( 'Imported from DHL Allyouneed' ) . ' (' . __ ( 'Delivery Method' ) . ':' . (( string ) $order->getDeliveryMethod ()) . ')' );
247
  $quoteObj->setCustomerFirstname ( $customer->getFirstname () );
248
  $quoteObj->setCustomerLastname ( $customer->getLastname () );
249
  $quoteObj->setCustomerIsGuest ( Mage::getStoreConfig ( self::USE_GUEST_ACCOUNT_CONFIG ) );
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 ();
288
  } elseif (( bool ) $stockItem->getData ( 'is_in_stock' )) {
289
 
290
  if (floatval ( $productObj->getPrice () ) != floatval ( $orderEntry->getBasePrice () )) {
291
+ $message = sprintf ( __ ( '%s was ordered with a different price (%s instead of current price %s). Was the price changed after exporting to Allyouneed?' ), $productObj->getName (), $orderEntry->getBasePrice (), $productObj->getPrice () );
292
  Mage::getSingleton ( 'adminhtml/session' )->addNotice ( $message );
293
  }
294
 
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/Service/Order/RefundExportService.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
 
3
  /**
4
- * Service class which sends a refund to MeinPaket.de.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
@@ -10,7 +10,7 @@
10
  */
11
  class Dhl_MeinPaketCommon_Model_Service_Order_RefundExportService {
12
  /**
13
- * Exports the given refunded creditmemo to MeinPaket.de.
14
  *
15
  * @param Mage_Sales_Model_Order_Creditmemo $creditmemo
16
  * @throws Dhl_MeinPaketCommon_Model_Xml_XmlBuildException
1
  <?php
2
 
3
  /**
4
+ * Service class which sends a refund to Allyouneed.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
10
  */
11
  class Dhl_MeinPaketCommon_Model_Service_Order_RefundExportService {
12
  /**
13
+ * Exports the given refunded creditmemo to Allyouneed.
14
  *
15
  * @param Mage_Sales_Model_Order_Creditmemo $creditmemo
16
  * @throws Dhl_MeinPaketCommon_Model_Xml_XmlBuildException
app/code/community/Dhl/MeinPaketCommon/Model/Service/Order/RefundExportService/Result.php CHANGED
@@ -46,7 +46,7 @@ class Dhl_MeinPaketCommon_Model_Service_Order_RefundExportService_Result extends
46
  }
47
 
48
  /**
49
- * Tells if the refund has been accepted by MeinPaket.de.
50
  *
51
  * @return boolean
52
  */
46
  }
47
 
48
  /**
49
+ * Tells if the refund has been accepted by Allyouneed.
50
  *
51
  * @return boolean
52
  */
app/code/community/Dhl/MeinPaketCommon/Model/Service/Order/ShipmentExportService.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
 
3
  /**
4
- * Service which exports an order's shipment to MeinPaket.de.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
@@ -10,7 +10,7 @@
10
  */
11
  class Dhl_MeinPaketCommon_Model_Service_Order_ShipmentExportService {
12
  /**
13
- * Exports a shipment to MeinPaket.de.
14
  *
15
  * @param Mage_Sales_Model_Order_Shipment $shipment
16
  * @throws Dhl_MeinPaketCommon_Model_Xml_XmlBuildException
@@ -34,7 +34,7 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ShipmentExportService {
34
  }
35
 
36
  /**
37
- * Exports the tracking number of a shipment to MeinPaket.de.
38
  *
39
  * @param Mage_Sales_Model_Order_Shipment $shipment
40
  * The shipment which tracking numbers shall be exported.
1
  <?php
2
 
3
  /**
4
+ * Service which exports an order's shipment to Allyouneed.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
10
  */
11
  class Dhl_MeinPaketCommon_Model_Service_Order_ShipmentExportService {
12
  /**
13
+ * Exports a shipment to Allyouneed.
14
  *
15
  * @param Mage_Sales_Model_Order_Shipment $shipment
16
  * @throws Dhl_MeinPaketCommon_Model_Xml_XmlBuildException
34
  }
35
 
36
  /**
37
+ * Exports the tracking number of a shipment to Allyouneed.
38
  *
39
  * @param Mage_Sales_Model_Order_Shipment $shipment
40
  * The shipment which tracking numbers shall be exported.
app/code/community/Dhl/MeinPaketCommon/Model/Service/Order/ShipmentExportService/Result.php CHANGED
@@ -33,7 +33,7 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ShipmentExportService_Result exten
33
  }
34
 
35
  /**
36
- * Sets the consignment id of the shipment which was returned from MeinPaket.de.
37
  *
38
  * @param string $consignmentId
39
  * @return Dhl_MeinPaketCommon_Model_Service_ShipmentExport_Result
@@ -44,7 +44,7 @@ class Dhl_MeinPaketCommon_Model_Service_Order_ShipmentExportService_Result exten
44
  }
45
 
46
  /**
47
- * Tells if the send consignment id has been returned by MeinPaket.de.
48
  * If this is true, the consignment has been accepted.
49
  *
50
  * @return boolean
33
  }
34
 
35
  /**
36
+ * Sets the consignment id of the shipment which was returned from Allyouneed.
37
  *
38
  * @param string $consignmentId
39
  * @return Dhl_MeinPaketCommon_Model_Service_ShipmentExport_Result
44
  }
45
 
46
  /**
47
+ * Tells if the send consignment id has been returned by Allyouneed.
48
  * If this is true, the consignment has been accepted.
49
  *
50
  * @return boolean
app/code/community/Dhl/MeinPaketCommon/Model/Xml/AbstractXmlRequest.php CHANGED
@@ -63,8 +63,8 @@ abstract class Dhl_MeinPaketCommon_Model_Xml_AbstractXmlRequest extends Dhl_Mein
63
  $languageNode = $this->getDocument ()->createElement ( 'common:language', 'de' );
64
  $multiplierIdNode = $this->getDocument ()->createElement ( 'common:multiplierId', 'MAGENTO' );
65
 
66
- $usernameNode->appendChild ( $this->getDocument ()->createTextNode ( $username ) );
67
- $passwordNode->appendChild ( $this->getDocument ()->createTextNode ( $password ) );
68
 
69
  $headerNode->appendChild ( $usernameNode );
70
  $headerNode->appendChild ( $passwordNode );
63
  $languageNode = $this->getDocument ()->createElement ( 'common:language', 'de' );
64
  $multiplierIdNode = $this->getDocument ()->createElement ( 'common:multiplierId', 'MAGENTO' );
65
 
66
+ $usernameNode->appendChild ( $this->getDocument ()->createCDATASection ( $username ) );
67
+ $passwordNode->appendChild ( $this->getDocument ()->createCDATASection ( $password ) );
68
 
69
  $headerNode->appendChild ( $usernameNode );
70
  $headerNode->appendChild ( $passwordNode );
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 (! $product->getData ( 'sync_with_dhl_mein_paket' ) && $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,16 +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 (! $product->getData ( 'sync_with_dhl_mein_paket' )) {
401
- /* @var $productDescription DOMNode */
402
- $productDeletion = $this->getDocument ()->createElement ( 'productDeletion' );
403
- $this->getDeletions ()->appendChild ( $productDeletion );
404
- $pId = $this->getDocument ()->createElement ( 'common:productId', $product->getId () );
405
- $productDeletion->appendChild ( $pId );
406
- return false;
407
- }
408
-
409
- if (! $product->getData ( 'sync_with_dhl_mein_paket' )) {
410
  $this->removeProduct ( $product );
411
  return false;
412
  }
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
@@ -16,10 +16,18 @@ class Dhl_MeinPaketCommon_Adminhtml_OrderImportController extends Mage_Adminhtml
16
  */
17
  protected function _initAction() {
18
  $this->loadLayout ()->_setActiveMenu ( 'meinpaket' );
19
- $this->_title ( $this->__ ( 'MeinPaket.de' ) )->_title ( $this->__ ( 'Order Import' ) );
20
  return $this;
21
  }
22
 
 
 
 
 
 
 
 
 
23
  /**
24
  * Default controller action.
25
  *
@@ -81,19 +89,19 @@ class Dhl_MeinPaketCommon_Adminhtml_OrderImportController extends Mage_Adminhtml
81
  }
82
 
83
  if ($orderCount ['outOfStock'] > 0) {
84
- $message = sprintf ( __ ( 'Skipped %s order(s) because: out of stock. Please process the following order(s) at your MeinPaket.de dealer area:' ), $orderCount ['outOfStock'] );
85
  $dhlOrderIds = implode ( ', ', $OrderImportService->getOutOfStockOrders () );
86
  Mage::getSingleton ( 'adminhtml/session' )->addError ( $message . " " . $dhlOrderIds );
87
  }
88
 
89
  if ($orderCount ['disabled'] > 0) {
90
- $message = sprintf ( __ ( 'Skipped %s order(s) because: some or all of the included products were disabled in Magento after the export to MeinPaket.de . Please process the following order(s) at your MeinPaket.de dealer area:' ), $orderCount ['disabled'] );
91
  $disabledDhlOrderIds = implode ( ', ', $OrderImportService->getDisabledProductOrders () );
92
  Mage::getSingleton ( 'adminhtml/session' )->addError ( $message . " " . $disabledDhlOrderIds );
93
  }
94
 
95
  if ($orderCount ['invalid'] > 0) {
96
- $message = sprintf ( __ ( 'Skipped %s order(s) because: some or all of the included products were invalid for import. Please process the following order(s) at your MeinPaket.de dealer area:' ), $orderCount ['invalid'] );
97
  Mage::getSingleton ( 'adminhtml/session' )->addError ( $message );
98
  }
99
  }
16
  */
17
  protected function _initAction() {
18
  $this->loadLayout ()->_setActiveMenu ( 'meinpaket' );
19
+ $this->_title ( $this->__ ( 'Allyouneed' ) )->_title ( $this->__ ( 'Order Import' ) );
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
  *
89
  }
90
 
91
  if ($orderCount ['outOfStock'] > 0) {
92
+ $message = sprintf ( __ ( 'Skipped %s order(s) because: out of stock. Please process the following order(s) at your Allyouneed dealer area:' ), $orderCount ['outOfStock'] );
93
  $dhlOrderIds = implode ( ', ', $OrderImportService->getOutOfStockOrders () );
94
  Mage::getSingleton ( 'adminhtml/session' )->addError ( $message . " " . $dhlOrderIds );
95
  }
96
 
97
  if ($orderCount ['disabled'] > 0) {
98
+ $message = sprintf ( __ ( 'Skipped %s order(s) because: some or all of the included products were disabled in Magento after the export to Allyouneed . Please process the following order(s) at your Allyouneed dealer area:' ), $orderCount ['disabled'] );
99
  $disabledDhlOrderIds = implode ( ', ', $OrderImportService->getDisabledProductOrders () );
100
  Mage::getSingleton ( 'adminhtml/session' )->addError ( $message . " " . $disabledDhlOrderIds );
101
  }
102
 
103
  if ($orderCount ['invalid'] > 0) {
104
+ $message = sprintf ( __ ( 'Skipped %s order(s) because: some or all of the included products were invalid for import. Please process the following order(s) at your Allyouneed dealer area:' ), $orderCount ['invalid'] );
105
  Mage::getSingleton ( 'adminhtml/session' )->addError ( $message );
106
  }
107
  }
app/code/community/Dhl/MeinPaketCommon/etc/adminhtml.xml CHANGED
@@ -2,16 +2,16 @@
2
  <config>
3
  <menu>
4
  <meinpaket>
5
- <title>MeinPaket.de</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,12 +21,29 @@
21
  <resources>
22
  <admin>
23
  <children>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
24
  <system>
25
  <children>
26
  <config>
27
  <children>
28
  <meinpaket translate="title" module="meinpaketcommon">
29
- <title>MeinPaket.de</title>
30
  <sort_order>100</sort_order>
31
  </meinpaket>
32
  </children>
2
  <config>
3
  <menu>
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>
44
  <children>
45
  <meinpaket translate="title" module="meinpaketcommon">
46
+ <title>Allyouneed</title>
47
  <sort_order>100</sort_order>
48
  </meinpaket>
49
  </children>
app/code/community/Dhl/MeinPaketCommon/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Dhl_MeinPaketCommon>
5
- <version>1.0.0</version>
6
  </Dhl_MeinPaketCommon>
7
  </modules>
8
  <admin>
@@ -72,15 +72,30 @@
72
  <allowspecific>0</allowspecific>
73
  <group>offline</group>
74
  </meinpaket>
 
 
 
 
 
 
 
 
75
  </payment>
76
  <carriers>
77
  <meinpaket>
78
  <active>1</active>
79
  <sallowspecific>0</sallowspecific>
80
- <title>MeinPaket.de</title>
81
  <name>MeinPaket</name>
82
  <model>meinpaketcommon/carrier_meinpaket</model>
83
  </meinpaket>
 
 
 
 
 
 
 
84
  </carriers>
85
  <meinpaket>
86
  <endpoint>
@@ -91,8 +106,11 @@
91
  <proxy_port></proxy_port>
92
  </endpoint>
93
  <shipment>
94
- <default_shipment_method>flatrate_flatrate</default_shipment_method>
95
  </shipment>
 
 
 
96
  <cron>
97
  <async>*/10 * * * *</async>
98
  <cleanup>0 6 * * *</cleanup>
2
  <config>
3
  <modules>
4
  <Dhl_MeinPaketCommon>
5
+ <version>1.3.0</version>
6
  </Dhl_MeinPaketCommon>
7
  </modules>
8
  <admin>
72
  <allowspecific>0</allowspecific>
73
  <group>offline</group>
74
  </meinpaket>
75
+ <allyouneed>
76
+ <active>1</active>
77
+ <model>meinpaketcommon/payment_method_allyouneed</model>
78
+ <order_status>pending</order_status>
79
+ <title>MeinPaket</title>
80
+ <allowspecific>0</allowspecific>
81
+ <group>offline</group>
82
+ </allyouneed>
83
  </payment>
84
  <carriers>
85
  <meinpaket>
86
  <active>1</active>
87
  <sallowspecific>0</sallowspecific>
88
+ <title>Allyouneed</title>
89
  <name>MeinPaket</name>
90
  <model>meinpaketcommon/carrier_meinpaket</model>
91
  </meinpaket>
92
+ <allyouneed>
93
+ <active>1</active>
94
+ <sallowspecific>0</sallowspecific>
95
+ <title>Allyouneed</title>
96
+ <name>Allyouneed</name>
97
+ <model>meinpaketcommon/carrier_allyouneed</model>
98
+ </allyouneed>
99
  </carriers>
100
  <meinpaket>
101
  <endpoint>
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
@@ -2,15 +2,14 @@
2
  <config>
3
  <sections>
4
  <meinpaket module="core" translate="label">
5
- <comment>Test</comment>
6
- <label>DHL MeinPaket / Postpay</label>
7
  <tab>general</tab>
8
  <frontend_type>text</frontend_type>
9
  <sort_order>1000</sort_order>
10
  <show_in_default>1</show_in_default>
11
  <show_in_website>1</show_in_website>
12
  <show_in_store>1</show_in_store>
13
- <class>meinpaket</class>
14
  <groups>
15
  <store>
16
  <label>Store</label>
@@ -19,8 +18,8 @@
19
  <show_in_default>1</show_in_default>
20
  <show_in_website>1</show_in_website>
21
  <show_in_store>1</show_in_store>
22
- <frontend_class>meinpaket</frontend_class>
23
- <fields translate="label">
24
  <view translate="label">
25
  <label>Store View</label>
26
  <frontend_type>select</frontend_type>
@@ -39,10 +38,10 @@
39
  <show_in_default>1</show_in_default>
40
  <show_in_website>1</show_in_website>
41
  <show_in_store>0</show_in_store>
42
- <frontend_class>meinpaket</frontend_class>
43
  <fields>
44
  <username translate="label comment">
45
- <label>DHL Username</label>
46
  <comment><![CDATA[This is the username that was given to you by DHL, mostly your email address.]]></comment>
47
  <frontend_type>text</frontend_type>
48
  <sort_order>10</sort_order>
@@ -51,7 +50,7 @@
51
  <show_in_store>0</show_in_store>
52
  </username>
53
  <password translate="label comment">
54
- <label>DHL Password</label>
55
  <comment><![CDATA[This is the password that was given to you by DHL.]]></comment>
56
  <frontend_type>password</frontend_type>
57
  <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
@@ -69,11 +68,11 @@
69
  <show_in_default>1</show_in_default>
70
  <show_in_website>1</show_in_website>
71
  <show_in_store>1</show_in_store>
72
- <frontend_class>meinpaket</frontend_class>
73
  <fields>
74
  <https translate="label comment">
75
  <label>Use HTTPs</label>
76
- <comment><![CDATA[Use https:// to connect to DHL MeinPaket]]></comment>
77
  <frontend_type>select</frontend_type>
78
  <source_model>adminhtml/system_config_source_yesno</source_model>
79
  <sort_order>10</sort_order>
@@ -83,7 +82,7 @@
83
  </https>
84
  <sandbox translate="label comment">
85
  <label>Use Sandbox</label>
86
- <comment><![CDATA[Use DHL MeinPaket sandbox]]></comment>
87
  <frontend_type>select</frontend_type>
88
  <source_model>adminhtml/system_config_source_yesno</source_model>
89
  <sort_order>11</sort_order>
@@ -93,7 +92,7 @@
93
  </sandbox>
94
  <proxy translate="label comment">
95
  <label>Use Proxy</label>
96
- <comment><![CDATA[Use proxy to connect to DHL MeinPaket]]></comment>
97
  <frontend_type>select</frontend_type>
98
  <source_model>adminhtml/system_config_source_yesno</source_model>
99
  <sort_order>20</sort_order>
@@ -103,7 +102,7 @@
103
  </proxy>
104
  <proxy_host translate="label comment">
105
  <label>Proxy Host</label>
106
- <comment><![CDATA[Used proxy host to connect to DHL MeinPaket. Disabled when empty]]></comment>
107
  <frontend_type>text</frontend_type>
108
  <sort_order>21</sort_order>
109
  <show_in_default>1</show_in_default>
@@ -115,7 +114,7 @@
115
  </proxy_host>
116
  <proxy_port translate="label comment">
117
  <label>Proxy Port</label>
118
- <comment><![CDATA[Use proxy port to connect to DHL MeinPaket. Disabled when empty]]></comment>
119
  <frontend_type>text</frontend_type>
120
  <sort_order>22</sort_order>
121
  <show_in_default>1</show_in_default>
@@ -134,7 +133,7 @@
134
  <show_in_default>1</show_in_default>
135
  <show_in_website>1</show_in_website>
136
  <show_in_store>1</show_in_store>
137
- <frontend_class>meinpaket</frontend_class>
138
  <fields>
139
  <default_shipment_method translate="label comment">
140
  <label>Default Shipment Method</label>
@@ -156,7 +155,7 @@
156
  <show_in_default>1</show_in_default>
157
  <show_in_website>1</show_in_website>
158
  <show_in_store>0</show_in_store>
159
- <frontend_class>meinpaket</frontend_class>
160
  <fields>
161
  <default_email translate="label comment">
162
  <label>Default customer email</label>
@@ -166,8 +165,18 @@
166
  <sort_order>10</sort_order>
167
  <show_in_default>1</show_in_default>
168
  <show_in_website>1</show_in_website>
169
- <show_in_store>0</show_in_store>
170
  </default_email>
 
 
 
 
 
 
 
 
 
 
171
  </fields>
172
  </customer>
173
  <cron translate="label">
@@ -177,7 +186,7 @@
177
  <show_in_default>1</show_in_default>
178
  <show_in_website>1</show_in_website>
179
  <show_in_store>0</show_in_store>
180
- <frontend_class>meinpaket</frontend_class>
181
  <fields>
182
  <async translate="label comment">
183
  <label>Async Request</label>
@@ -215,7 +224,7 @@
215
  <show_in_default>1</show_in_default>
216
  <show_in_website>1</show_in_website>
217
  <show_in_store>0</show_in_store>
218
- <frontend_class>meinpaket</frontend_class>
219
  <fields>
220
  <cycle_product_count translate="label comment">
221
  <label>Cycle product count</label>
@@ -233,8 +242,8 @@
233
  </meinpaket>
234
  <carriers>
235
  <groups>
236
- <meinpaket translate="label" module="meinpaket">
237
- <label>MeinPaket Versand Modul</label>
238
  <frontend_type>text</frontend_type>
239
  <sort_order>20</sort_order>
240
  <show_in_default>1</show_in_default>
@@ -251,7 +260,7 @@
251
  <show_in_store>1</show_in_store>
252
  </active>
253
  </fields>
254
- </meinpaket>
255
  </groups>
256
  </carriers>
257
  </sections>
2
  <config>
3
  <sections>
4
  <meinpaket module="core" translate="label">
5
+ <label>DHL Allyouneed / Postpay</label>
 
6
  <tab>general</tab>
7
  <frontend_type>text</frontend_type>
8
  <sort_order>1000</sort_order>
9
  <show_in_default>1</show_in_default>
10
  <show_in_website>1</show_in_website>
11
  <show_in_store>1</show_in_store>
12
+ <class>allyouneed</class>
13
  <groups>
14
  <store>
15
  <label>Store</label>
18
  <show_in_default>1</show_in_default>
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>
38
  <show_in_default>1</show_in_default>
39
  <show_in_website>1</show_in_website>
40
  <show_in_store>0</show_in_store>
41
+ <frontend_class>allyouneed</frontend_class>
42
  <fields>
43
  <username translate="label comment">
44
+ <label>Username</label>
45
  <comment><![CDATA[This is the username that was given to you by DHL, mostly your email address.]]></comment>
46
  <frontend_type>text</frontend_type>
47
  <sort_order>10</sort_order>
50
  <show_in_store>0</show_in_store>
51
  </username>
52
  <password translate="label comment">
53
+ <label>Password</label>
54
  <comment><![CDATA[This is the password that was given to you by DHL.]]></comment>
55
  <frontend_type>password</frontend_type>
56
  <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
68
  <show_in_default>1</show_in_default>
69
  <show_in_website>1</show_in_website>
70
  <show_in_store>1</show_in_store>
71
+ <frontend_class>allyouneed</frontend_class>
72
  <fields>
73
  <https translate="label comment">
74
  <label>Use HTTPs</label>
75
+ <comment><![CDATA[Use https:// to connect to DHL Allyouneed]]></comment>
76
  <frontend_type>select</frontend_type>
77
  <source_model>adminhtml/system_config_source_yesno</source_model>
78
  <sort_order>10</sort_order>
82
  </https>
83
  <sandbox translate="label comment">
84
  <label>Use Sandbox</label>
85
+ <comment><![CDATA[Use DHL Allyouneed sandbox]]></comment>
86
  <frontend_type>select</frontend_type>
87
  <source_model>adminhtml/system_config_source_yesno</source_model>
88
  <sort_order>11</sort_order>
92
  </sandbox>
93
  <proxy translate="label comment">
94
  <label>Use Proxy</label>
95
+ <comment><![CDATA[Use proxy to connect to DHL Allyouneed]]></comment>
96
  <frontend_type>select</frontend_type>
97
  <source_model>adminhtml/system_config_source_yesno</source_model>
98
  <sort_order>20</sort_order>
102
  </proxy>
103
  <proxy_host translate="label comment">
104
  <label>Proxy Host</label>
105
+ <comment><![CDATA[Used proxy host to connect to DHL Allyouneed. Disabled when empty]]></comment>
106
  <frontend_type>text</frontend_type>
107
  <sort_order>21</sort_order>
108
  <show_in_default>1</show_in_default>
114
  </proxy_host>
115
  <proxy_port translate="label comment">
116
  <label>Proxy Port</label>
117
+ <comment><![CDATA[Use proxy port to connect to DHL Allyouneed. Disabled when empty]]></comment>
118
  <frontend_type>text</frontend_type>
119
  <sort_order>22</sort_order>
120
  <show_in_default>1</show_in_default>
133
  <show_in_default>1</show_in_default>
134
  <show_in_website>1</show_in_website>
135
  <show_in_store>1</show_in_store>
136
+ <frontend_class>allyouneed</frontend_class>
137
  <fields>
138
  <default_shipment_method translate="label comment">
139
  <label>Default Shipment Method</label>
155
  <show_in_default>1</show_in_default>
156
  <show_in_website>1</show_in_website>
157
  <show_in_store>0</show_in_store>
158
+ <frontend_class>allyouneed</frontend_class>
159
  <fields>
160
  <default_email translate="label comment">
161
  <label>Default customer email</label>
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">
186
  <show_in_default>1</show_in_default>
187
  <show_in_website>1</show_in_website>
188
  <show_in_store>0</show_in_store>
189
+ <frontend_class>allyouneed</frontend_class>
190
  <fields>
191
  <async translate="label comment">
192
  <label>Async Request</label>
224
  <show_in_default>1</show_in_default>
225
  <show_in_website>1</show_in_website>
226
  <show_in_store>0</show_in_store>
227
+ <frontend_class>allyouneed</frontend_class>
228
  <fields>
229
  <cycle_product_count translate="label comment">
230
  <label>Cycle product count</label>
242
  </meinpaket>
243
  <carriers>
244
  <groups>
245
+ <allyouneed translate="label" module="meinpaket">
246
+ <label>Allyouneed Versand Modul</label>
247
  <frontend_type>text</frontend_type>
248
  <sort_order>20</sort_order>
249
  <show_in_default>1</show_in_default>
260
  <show_in_store>1</show_in_store>
261
  </active>
262
  </fields>
263
+ </allyouneed>
264
  </groups>
265
  </carriers>
266
  </sections>
app/code/community/Dhl/MeinPaketCommon/sql/meinpaketcommon_setup/mysql4-install-1.0.0.php CHANGED
@@ -11,10 +11,12 @@
11
  * delete from eav_attribute where attribute_code = "max_stock_for_dhl_mein_paket";
12
  * delete from eav_attribute where attribute_code = "shipment_was_exported_for_dhl_mein_paket";
13
  * delete from eav_attribute where attribute_code = "dhl_mein_paket_order_id";
14
- * delete from eav_attribute_group where attribute_group_name = "MeinPaket.de";
15
  * alter table sales_flat_order drop column dhl_mein_paket_order_id;
16
  * alter table sales_flat_order_grid drop column dhl_mein_paket_order_id;
 
17
  *
 
18
  * drop table meinpaket_log
19
  */
20
 
@@ -73,10 +75,6 @@ if (! $orderIdFieldExists) {
73
  $installer->getConnection ()->addColumn ( $installer->getTable ( 'sales_flat_shipment' ), 'shipment_was_exported_for_dhl_mein_paket', 'int(1) NULL DEFAULT NULL AFTER `entity_id`' );
74
  }
75
 
76
- Mage::getSingleton ( 'adminhtml/session' )->addSuccess ( 'DHL MeinPaket.de extension was successfully installed!' );
77
-
78
- $installer->installEntities ();
79
-
80
  $installer->run ( "
81
  DROP TABLE IF EXISTS {$this->getTable('meinpaketcommon/async')};
82
  CREATE TABLE {$this->getTable('meinpaketcommon/async')} (
@@ -100,7 +98,7 @@ $installer->run ( "
100
  `error` text default '',
101
  `created_at` datetime default '0000-00-00 00:00:00',
102
  PRIMARY KEY(`log_id`)
103
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='MeinPaket Sync';
104
  " );
105
 
106
  $installer->endSetup ();
11
  * delete from eav_attribute where attribute_code = "max_stock_for_dhl_mein_paket";
12
  * delete from eav_attribute where attribute_code = "shipment_was_exported_for_dhl_mein_paket";
13
  * delete from eav_attribute where attribute_code = "dhl_mein_paket_order_id";
14
+ * delete from eav_attribute_group where attribute_group_name = "Allyouneed";
15
  * alter table sales_flat_order drop column dhl_mein_paket_order_id;
16
  * alter table sales_flat_order_grid drop column dhl_mein_paket_order_id;
17
+ * alter table sales_flat_shipment drop column shipment_was_exported_for_dhl_mein_paket;
18
  *
19
+ * drop table meinpaket_async
20
  * drop table meinpaket_log
21
  */
22
 
75
  $installer->getConnection ()->addColumn ( $installer->getTable ( 'sales_flat_shipment' ), 'shipment_was_exported_for_dhl_mein_paket', 'int(1) NULL DEFAULT NULL AFTER `entity_id`' );
76
  }
77
 
 
 
 
 
78
  $installer->run ( "
79
  DROP TABLE IF EXISTS {$this->getTable('meinpaketcommon/async')};
80
  CREATE TABLE {$this->getTable('meinpaketcommon/async')} (
98
  `error` text default '',
99
  `created_at` datetime default '0000-00-00 00:00:00',
100
  PRIMARY KEY(`log_id`)
101
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='MeinPaket Log';
102
  " );
103
 
104
  $installer->endSetup ();
app/code/community/Dhl/MeinPaketCommon/sql/meinpaketcommon_setup/mysql4-upgrade-1.0.0-1.1.0.php ADDED
@@ -0,0 +1,33 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ /* @var $installer Dhl_MeinPaketCommon_Model_Resource_Eav_Mysql4_Setup */
4
+ $installer = $this;
5
+ $installer->startSetup ();
6
+
7
+ $installer->addAttribute ( 'order', 'meinpaket_id', array (
8
+ 'type' => 'int',
9
+ 'label' => 'Order Allyouneed Id',
10
+ 'required' => false,
11
+ 'is_visible' => false,
12
+ 'visible' => false
13
+ ) );
14
+
15
+ $installer->addAttribute ( 'customer', 'meinpaket_buyer_id', array (
16
+ 'type' => 'int',
17
+ 'label' => 'Allyouneed Buyer Id',
18
+ 'input' => 'text',
19
+ 'required' => false,
20
+ 'sort_order' => 200,
21
+ 'visible' => false
22
+ ) );
23
+
24
+ $installer->addAttribute ( 'customer', 'meinpaket_buyer_name', array (
25
+ 'type' => 'varchar',
26
+ 'label' => 'Allyouneed Buyer Name',
27
+ 'input' => 'text',
28
+ 'required' => false,
29
+ 'sort_order' => 201,
30
+ 'visible' => false
31
+ ) );
32
+
33
+ $installer->endSetup ();
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/Block/Adminhtml/Version.php ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
1
+ <?php
2
+ class Dhl_Postpay_Block_Adminhtml_Version extends Mage_Adminhtml_Block_System_Config_Form_Field {
3
+ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) {
4
+ return ( string ) Mage::helper ( 'postpay/data' )->getExtensionVersion ();
5
+ }
6
+ }
app/code/community/Dhl/Postpay/Model/Cron.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
 
3
  /**
4
- * Cron handler for Dhl MeinPaket.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
1
  <?php
2
 
3
  /**
4
+ * Cron handler for Dhl Allyouneed.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
app/code/community/Dhl/Postpay/Model/Observer.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
 
3
  /**
4
- * Observer for all events the DHL MeinPaket extension has to catch.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
1
  <?php
2
 
3
  /**
4
+ * Observer for all events the DHL Allyouneed extension has to catch.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
app/code/community/Dhl/Postpay/Model/Resource/Eav/Mysql4/Setup.php CHANGED
@@ -1,11 +1,4 @@
1
  <?php
2
  class Dhl_Postpay_Model_Resource_Eav_Mysql4_Setup extends Mage_Catalog_Model_Resource_Setup {
3
- /**
4
- *
5
- * @return array
6
- */
7
- public function getDefaultEntities() {
8
- return array ();
9
- }
10
  }
11
 
1
  <?php
2
  class Dhl_Postpay_Model_Resource_Eav_Mysql4_Setup extends Mage_Catalog_Model_Resource_Setup {
 
 
 
 
 
 
 
3
  }
4
 
app/code/community/Dhl/Postpay/Model/Service/Order/ImportService.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
 
3
  /**
4
- * Service class which imports orders from MeinPaket.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
1
  <?php
2
 
3
  /**
4
+ * Service class which imports orders from Allyouneed.
5
  *
6
  * @category Dhl
7
  * @package Dhl_MeinPaket
app/code/community/Dhl/Postpay/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Dhl_Postpay>
5
- <version>1.0.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/code/community/Dhl/Postpay/sql/postpay_setup/mysql4-install-1.0.0.php CHANGED
@@ -7,8 +7,6 @@
7
  $installer = $this;
8
  $installer->startSetup ();
9
 
10
- $installer->installEntities ();
11
-
12
  $installer->run ( "
13
  DROP TABLE IF EXISTS {$this->getTable('postpay/cart')};
14
  CREATE TABLE {$this->getTable('postpay/cart')} (
@@ -18,7 +16,7 @@ $installer->run ( "
18
  `state` varchar(255) DEFAULT 'PENDING',
19
  `created_at` timestamp default CURRENT_TIMESTAMP(),
20
  PRIMARY KEY(`cart_id`)
21
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='MeinPaket Sync';
22
  " );
23
 
24
  $installer->endSetup ();
7
  $installer = $this;
8
  $installer->startSetup ();
9
 
 
 
10
  $installer->run ( "
11
  DROP TABLE IF EXISTS {$this->getTable('postpay/cart')};
12
  CREATE TABLE {$this->getTable('postpay/cart')} (
16
  `state` varchar(255) DEFAULT 'PENDING',
17
  `created_at` timestamp default CURRENT_TIMESTAMP(),
18
  PRIMARY KEY(`cart_id`)
19
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Allyouneed Sync';
20
  " );
21
 
22
  $installer->endSetup ();
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>
app/design/adminhtml/default/default/template/meinpaket/category/import/import.phtml CHANGED
@@ -6,7 +6,7 @@
6
  <div class="content-header">
7
  <table class="grid-header">
8
  <tr>
9
- <td><h3 class="icon-head meinpaket"><?php echo __('Import Categories'); ?></h3></td>
10
  <td class="a-right">
11
  <button
12
  onclick="setLocation('<?php echo $this->getUrl('meinpaket/adminhtml_categoryImport/index/') ?>')"
@@ -17,8 +17,8 @@
17
  </tr>
18
  </table>
19
  </div>
20
- <div class="dashboard-container meinpaket-content">
21
- <ul class="meinpaket-steps">
22
  <li class="nr1"><p><?php echo __('Overview'); ?></p></li>
23
  <li class="nr2"><p><?php echo __('Import'); ?></p></li>
24
  <li class="nr3 active"><p><?php echo __('Result'); ?></p></li>
@@ -27,9 +27,9 @@
27
  <!-- -->
28
  </div>
29
 
30
- <div id="meinpaket-results" class="scrollablebox grid entry-edit">
31
  <?php if($result !== null && $result->getNewCategoriesCount() + $result->getDeletedCategoriesCount() + $result->getUpdatedCategoriesCount() > 0) : ?>
32
- <table id="meinpaket-results">
33
  <tbody>
34
 
35
  <?php /*** NEW CATEGORIES **********************************************/ ?>
@@ -112,7 +112,7 @@
112
  </tbody>
113
  </table>
114
  <?php else : ?>
115
- <div class="meinpaket-description">
116
  <p><?php echo __('Marketplace category structure was up to date. There have been no changes.'); ?></p>
117
  </div>
118
  <?php endif; ?>
6
  <div class="content-header">
7
  <table class="grid-header">
8
  <tr>
9
+ <td><h3 class="icon-head allyouneed"><?php echo __('Import Categories'); ?></h3></td>
10
  <td class="a-right">
11
  <button
12
  onclick="setLocation('<?php echo $this->getUrl('meinpaket/adminhtml_categoryImport/index/') ?>')"
17
  </tr>
18
  </table>
19
  </div>
20
+ <div class="dashboard-container allyouneed-content">
21
+ <ul class="allyouneed-steps">
22
  <li class="nr1"><p><?php echo __('Overview'); ?></p></li>
23
  <li class="nr2"><p><?php echo __('Import'); ?></p></li>
24
  <li class="nr3 active"><p><?php echo __('Result'); ?></p></li>
27
  <!-- -->
28
  </div>
29
 
30
+ <div id="allyouneed-results" class="scrollablebox grid entry-edit">
31
  <?php if($result !== null && $result->getNewCategoriesCount() + $result->getDeletedCategoriesCount() + $result->getUpdatedCategoriesCount() > 0) : ?>
32
+ <table id="allyouneed-results">
33
  <tbody>
34
 
35
  <?php /*** NEW CATEGORIES **********************************************/ ?>
112
  </tbody>
113
  </table>
114
  <?php else : ?>
115
+ <div class="allyouneed-description">
116
  <p><?php echo __('Marketplace category structure was up to date. There have been no changes.'); ?></p>
117
  </div>
118
  <?php endif; ?>
app/design/adminhtml/default/default/template/meinpaket/category/import/index.phtml CHANGED
@@ -1,6 +1,6 @@
1
 
2
  <div class="content-header">
3
- <table cellspacing="0" class="grid-header">
4
  <tr>
5
  <td><h3 class="icon-head meinpaket"><?php echo __('Import Categories'); ?></h3></td>
6
  <td class="a-right">
@@ -13,9 +13,9 @@
13
  </tr>
14
  </table>
15
  </div>
16
- <div class="dashboard-container meinpaket-content">
17
 
18
- <ul class="meinpaket-steps">
19
  <li class="active nr1"><p><?php echo __('Overview'); ?></p></li>
20
  <li class="nr2"><p><?php echo __('Import'); ?></p></li>
21
  <li class="nr3"><p><?php echo __('Result'); ?></p></li>
@@ -24,24 +24,26 @@
24
  <!-- -->
25
  </div>
26
 
27
- <div id="meinpaket-description">
28
  <p><?php echo __('Textual introduction into category import goes here...'); ?></p>
 
 
 
 
 
 
 
 
 
 
29
  </div>
30
 
31
- <div id="disabled-till-export" class="meinpaket-waitbox"
32
  style="display: none">
33
- <img src="<?php echo $this->getSkinUrl('meinpaketcommon/images/loader.gif')?>" /><br />
 
34
  <small><?php echo $this->__('please wait'); ?></small>
35
  </div>
36
 
37
- <form id="meinpaket_form" name="meinpaket_form" method="get"
38
- action="<?php echo $this->getUrl('meinpaket/adminhtml_categoryImport/import/') ?>">
39
- <fieldset>
40
- <button onclick="startProcessing()" class="scalable" type="button"
41
- id="startButton">
42
- <span><?php echo $this->__('import categories'); ?></span>
43
- </button>
44
- </fieldset>
45
- </form>
46
  </div>
47
 
1
 
2
  <div class="content-header">
3
+ <table class="grid-header">
4
  <tr>
5
  <td><h3 class="icon-head meinpaket"><?php echo __('Import Categories'); ?></h3></td>
6
  <td class="a-right">
13
  </tr>
14
  </table>
15
  </div>
16
+ <div class="dashboard-container allyouneed-content">
17
 
18
+ <ul class="allyouneed-steps">
19
  <li class="active nr1"><p><?php echo __('Overview'); ?></p></li>
20
  <li class="nr2"><p><?php echo __('Import'); ?></p></li>
21
  <li class="nr3"><p><?php echo __('Result'); ?></p></li>
24
  <!-- -->
25
  </div>
26
 
27
+ <div id="allyouneed-description">
28
  <p><?php echo __('Textual introduction into category import goes here...'); ?></p>
29
+
30
+ <form id="allyouneed_form" name="allyouneed_form" method="get"
31
+ action="<?php echo $this->getUrl('meinpaket/adminhtml_categoryImport/import/') ?>">
32
+ <fieldset>
33
+ <button onclick="startProcessing()" class="scalable" type="button"
34
+ id="startButton">
35
+ <span><?php echo $this->__('import categories'); ?></span>
36
+ </button>
37
+ </fieldset>
38
+ </form>
39
  </div>
40
 
41
+ <div id="disabled-till-export" class="allyouneed-waitbox"
42
  style="display: none">
43
+ <img
44
+ src="<?php echo $this->getSkinUrl('meinpaketcommon/images/loader.gif')?>" /><br />
45
  <small><?php echo $this->__('please wait'); ?></small>
46
  </div>
47
 
 
 
 
 
 
 
 
 
 
48
  </div>
49
 
app/design/adminhtml/default/default/template/meinpaket/steps.phtml CHANGED
@@ -1,5 +1,5 @@
1
 
2
- <ul class="meinpaket-steps">
3
  <?php
4
  $i = 0;
5
  foreach ( $this->steps as $k => $v ) :
1
 
2
+ <ul class="allyouneed-steps">
3
  <?php
4
  $i = 0;
5
  foreach ( $this->steps as $k => $v ) :
app/locale/de_DE/Dhl_MeinPaket.csv CHANGED
@@ -1,185 +1,90 @@
1
- "import Variantconfigurations","Variantenkonfigurationen importieren"
2
- "Credentials","Zugangsdaten"
3
- "export products","Produkte exportieren"
4
- "import orders","Bestellungen importieren"
5
- "import categories","Kategorien importieren"
6
- "list products","Produkte anzeigen"
7
- "select products","Produktauswahl angeben"
8
- "edit product","Produkt bearbeiten"
9
- "only marked products", "Nur ausgewählte Produkte"
10
  "all","Alle"
11
- "start again","nochmal starten"
 
 
 
 
12
  "best prices","Beste Preise"
13
- "DHL Username","Benutzername"
14
- "This is the username that was given to you by DHL, mostly your email address.","Dies ist der Benutzername, der Ihnen von DHL mitgeteilt wurde. Meisst ist dies Ihre E-Mail Adresse."
15
- "DHL Password","Passwort"
16
- "This is the password that was given to you by DHL.","Dies ist das Passwort, das Ihnen von DHL mitgeteilt wurde."
17
- "Remote system","Entferntes System"
18
- "This is the address of the remote API.","Dies ist die Adresse der entfernten API."
19
- "Tax rates","Steuersätze"
 
 
 
 
 
 
20
  "Default tax rate","Standard-Steuersatz"
21
- "The default tax rate applies to most products","Dieser Steuersatz gilt für die meissten Produkte."
22
- "Reduced tax rate","reduzierter Steuersatz"
23
- "The reduced tax rate applies to special products, such as aliments","Der reduzierte Steuersatz, der für spezielle Produkte - etwa Nahrungsmittel - gilt."
24
- "Shop tree root","Shop Hauptkategorie"
25
- "Marketplace tree root","Marktplatz Hauptkategorie"
26
- "Sync with MeinPaket.de","mit MeinPaket.de abgleichen"
27
- "Maximum stock qty. for MeinPaket.de","maximale Stückzahl für MeinPaket.de"
28
- "Product attributes","Produkteigenschaften"
29
  "Delivery time","Lieferzeit (in Tagen)"
30
- "Please select the product attribute which represents the approx. delivery time","Bitte wählen Sie die Produkteigenschaft, welche die Lieferzeit angibt."
31
- "Default delivery time","Standard-Lieferzeit"
32
- "Delivery time in days if no other delivery time applies","Lieferzeit in Tagen, wenn keine andere Lieferzeit angegeben."
33
- "Marketplace category ID","Marktplatz-Kategorie"
34
- "These products could not be exported","Die folgenden Produkte konnten aufgrund von Fehlern nicht exportiert werden"
35
- "Result","Ergebnis"
36
- "Selection","Auswahl"
37
- "Upload","Upload"
38
- "Common Errors","Allgemeine Fehler"
39
- "Product","Produkt"
40
- "Edit Product","Produkt bearbeiten"
41
- "Error Description","Fehlerbeschreibung"
 
42
  "Invalid value for field","Ungültiger Wert für Feld"
 
 
 
43
  "Missing value for field","Fehlender Wert für Feld"
44
- "The following products could only be exported as description","Für die folgenden Produkte konnten nur Angebote eingestellt werden"
45
- "Unknown Error","Unbekannter Fehler"
46
- "Product is unknown in MeinPaket marketplace","Produkt ist im MeinPaket Marktplatz nicht bekannt"
47
- "Successfully Exported Products","Erfolgreich exportierte Produkte"
48
- "total","gesamt"
49
- "of","von"
50
- "%s of %s products were successfully exported","%s von %s Produkten wurden erfolgreich exportiert"
51
- "At this place you can choose which products you want to export and start the process.","<b>Hier können Sie Produkte Ihres Magento-Shops nach MeinPaket.de exportieren.</b><p>Wählen Sie in der Auswahlliste unten den Punkt &bdquo;<i>Nur ausgewählte Produkte</i>&rdquo;, um nur die Produkte zu exportieren, deren &bdquo;<i>mit MeinPaket.de abgleichen</i>&rdquo;-Attribut explizit auf &bdquo;<i>Ja</i>&rdquo; gesetzt wurde. Dieses Attribut können Sie in den Produktinformationen im Reiter &bdquo;<i>Allgemein</i>&rdquo; bearbeiten.</p><p>Um alle Produkte Ihres Magento-Shops nach MeinPaket.de zu exportieren, wählen Sie &bdquo;<i>Alle</i>&rdquo; in der unten stehenden Auswahlliste. Berücksichtigt werden hierbei nur Produkte, die einer MeinPaket.de-Marktplatzkategorie zugeordnet sind.</p><p>Sie starten den Vorgang durch Betätigen des &bdquo;<i>Produkte exportieren</i>&rdquo;-Buttons. Dadurch springt der Export in den Upload-Modus. Unterbrechen Sie den Prozess während dessen nicht.</p><p>Wenn alle ausgewählten Produkte an MeinPaket übermittelt wurden, sehen Sie eine Übersicht aller exportierter Produkte sowie eine detaillierte Auflistung aller während des Vorgangs aufgetretenen Fehler.</p>"
52
- "Skipped %s duplicate orders that were already imported previously.","%s Bestellungen übersprungen, die bereits zu einem früheren Zeitpunkt importiert wurden."
53
- "Skipped %s duplicate order that was already imported previously.","%s Bestellung übersprungen, die bereits zu einem früheren Zeitpunkt importiert wurde."
54
- "%s order(s) sucessfully imported.","%s Bestellung(en) erfolgreich importiert."
55
- "start date","Startdatum"
56
- "end date","Enddatum"
57
- "Textual guide for importing orders follows here","<b>Hier können Sie Bestellungen importieren, die Käufer auf MeinPaket.de getätigt haben.</b><p>Legen Sie mit Hilfe der Felder &bdquo;<i>Startdatum</i>&rdquo; und &bdquo;<i>Enddatum</i>&rdquo; einen Zeitraum fest, für den Sie Bestellungen von MeinPaket.de importieren möchten. Sie können das Feld &bdquo;<i>Enddatum</i>&rdquo; leer lassen, um alle Bestellungen vom &bdquo;<i>Startdatum</i>&rdquo; bis zum jetzigen Zeitpunkt zu importieren.</p><p>Starten Sie den Vorgang durch Betätigen des &bdquo;<i>Bestellungen importieren</i>&rdquo;-Buttons. Warten Sie, bis der Vorgang abgeschlossen ist. Sie sehen im Anschluss einen Statusbericht über die importierten Bestellungen.</p>"
58
- "leave empty to load all till now","leer lassen, um alles bis jetzt zu laden"
59
  "please wait","Bitte warten...",
60
- "view orders","Bestellungen ansehen"
61
- "Finished","Abgeschlossen"
62
- "Import Products","Bestellungen importieren"
63
- "Import Categories","MeinPaket.de Kategorien importieren"
64
- "Category import completed.","Der Import der MeinPaket.de Marktplatz-Kategorien wurde abgeschlossen."
65
- "Textual introduction into category import goes here...","<b>Hier können Sie die Marktplatzkategorien von MeinPaket.de importieren. Die Kategorien finden Sie im Anschluss unter der Kategorie &bdquo;<i>MeinPaket.de marketplace</i>&rdquo; auf der obersten Ebene Ihres Magento-Kategoriebaumes.</b><p>Wenn Sie die MeinPaket.de-Marktplatzkategorien schon einmal importiert haben, werden diese nicht überschrieben, sondern nur mögliche Änderungen und Ergänzungen vorgenommen. Produkte, die Sie bereits MeinPaket.de-Marktplatzkategorien zugeordnet haben, bleiben weiterhin diesen Kategorien zugeordnet.</p><p>Starten Sie den Importvorgang durch Betätigen des &bdquo;<i>Kategorien importieren</i>&rdquo;-Buttons. Der Vorgang kann einige Minuten dauern. Brechen Sie den Vorgang nicht ab.</p>"
66
- "Product export failed. Failed connecting to MeinPaket server.","Produktexport fehlgeschlagen: Konnte keine Verbindung zu MeinPaket.de aufgebaut werden."
67
- "No new orders found.","Es wurden keine neuen Bestellungen gefunden."
68
- "Skipped %s order(s) because: out of stock. Please process the following order(s) at your MeinPaket.de dealer area:","%s Bestellung(en) übersprungen, da nicht auf Lager. Bitte bearbeiten Sie die folgende(n) Bestellung(en) in Ihrem MeinPaket Händlerbereich:"
69
- "Skipped %s order(s) because: some or all of the included products were disabled in Magento after the export to MeinPaket.de . Please process the following order(s) at your MeinPaket.de dealer area:","%s Bestellung(en) übersprungen, da sie Produkte enthielten, die nachträglich zum Export nach MeinPaket.de in Magento deaktiviert wurden. Bitte bearbeiten Sie die folgende(n) Bestellung(en) in Ihrem MeinPaket Händlerbereich:"
70
- "%s was ordered with a different price (%s instead of current price %s). Was the price changed after exporting to MeinPaket.de?","%s wurde zu einem anderen Preis bestellt (%s statt aktuellem Preis %s). Wurde der Preis nachträglich nach dem Export zu MeinPaket.de geändert?"
71
- "Internal error on MeinPaket server","Interner Fehler auf MeinPaket-Server",
72
  "Product stock is lower than zero.","Der Lagerbestand für dieses Produkt ist im negativen Bereich."
73
- "Overview","Übersicht"
74
- "Category","Kategorie"
75
- "Old name","Alter Name"
76
- "Edit Category","Kategorie bearbeiten"
77
- "New categories","Neue Kategorien"
78
- "Renamed categories","Umbenannte Kategorien"
79
- "Deleted categories","Gelöschte Kategorien"
80
- "Successfully imported marketplace categories.","Die Marktplatz-Kategorien wurden erfolgreich mit MeinPaket.de abgeglichen."
81
- "Connecting to MeinPaket.de server failed.","Die Verbindung zum MeinPaket.de-Server konnte nicht aufgebaut werden."
82
- "Connection to MeinPaket.de server timed out.","Der MeinPaket.de-Server antwortet nicht."
83
- "Unknown error","Es ist ein unbekannter Fehler aufgetreten"
84
- "Error","Fehler"
85
- "Added %s new categories.","Es wurden %s neue Kategorien angelegt."
86
  "Renamed %s categories.","Es wurden %s Kategorien umbenannt."
87
- "Deleted %s categories.","Es wurden %s Kategorien gelöscht, die im MeinPaket.de-Marktplatz nicht mehr verfügbar sind."
88
- "Marketplace category structure was up to date. There have been no changes.","Markplatz-Kategoriestruktur ist auf dem neuesten Stand."
89
- "Imported from DHL MeinPaket.de","Importiert von MeinPaket.de"
90
- "MeinPaket.de Order No.","MeinPaket.de Best.Nr."
91
- "Request could not be built.","Die Anfrage konnte nicht generiert werden."
92
- "MeinPaket.de server returned HTPP code %s.","Der MeinPaket.de-Server hat den HTTP-Fehlercode %s zurückgeliefert."
93
- "Connection to MeinPaket.de server timed out.","Zeitüberschreitung beim Verbindungsaufbau zu MeinPaket.de-Server."
94
- "Invalid response from MeinPaket.de server.","Ungültige Antwort von MeinPaket.de-Server erhalten."
95
- "Error on tranfering cancelled items to MeinPaket.de.","Bei der Stornierung der Bestellpositionen bei MeinPaket.de ist ein Fehler aufgetreten."
96
- "MeinPaket.de server returned error code %s.","Der MeinPaket.de-Server hat den Fehlercode %s zurückgegeben."
97
- "Shipment has not been accepted by MeinPaket.de.","Die Lieferung wurde von MeinPaket.de nicht akzeptiert."
98
- "Error on transfering shipment to MeinPaket.de.","Fehler beim Senden der Lieferinformationen zu MeinPaket.de."
99
- "Refund has not been accepted by MeinPaket.de.","Die Gutschrift wurde nicht von MeinPaket.de akzeptiert."
100
- "Error on transfering refund to MeinPaket.de.","Fehler beim Senden der Gutschrift an MeinPaket.de."
101
- "Tracking code has not been accepted by MeinPaket.de.","Der gesendete Tracking-Code für diese Lieferung wurde von MeinPaket.de nicht akzeptiert."
102
- "MeinPaket.de returned error code %s.","MeinPaket.de lieferte den Fehler-Code %s zurück."
103
- "Error on transfering tracking code to MeinPaket.de.","Fehler beim Senden des Tracking-Codes am MeinPaket.de."
104
- "There were no products that could be exported.","Es konnten keine Produkte exportiert werden."
105
- "Product information has not been accepted by MeinPaket.de.","Die Produktinformationen wurden von MeinPaket.de nicht akzeptiert."
106
- "Error on transfering product information to MeinPaket.de.","Fehler beim Exportieren des Produktes nach MeinPaket.de."
107
- "Thank you for your order!","Vielen Dank für Ihre Bestellung!"
108
- "Your order was successfully processed at MeinPaket.de. We will recieve your order shortly.","Ihre Bestellung wurde bei MeinPaket.de erfogreich bearbeitet. Wir werden Ihre Bestellung in Kürze erhalten."
109
- "Ooops!","Uuups!"
110
- "Something has gone terribly wrong while processing your order at MeinPaket.de! Please contact our customer service.","Etwas ist schiefgelaufen, während Ihre Bestellung bei MeinPaket.de bearbeitet wurde. Bitte kontaktieren Sie unseren Kundenservice!"
111
- "Checkout aborted!","Bestellvorgang abgebrochen!"
112
- "You decided to abort the external checkout at DHL MeinPaket. Your order has NOT been processed yet. Feel free to continue shopping and use our own checkout.","Sie haben den POSTPAY abgebrochen. Ihre Bestellung wurde noch NICHT verabeitet. Gerne können Sie Ihren Einkauf fortsetzen und unseren Checkout nutzen."
113
- "Continue shopping","Einkauf fortsetzen"
114
- "Checkout","Checkout"
115
- "POSTPAY available","POSTPAY anbieten"
116
- "This defines wether the external Checkout with DHL is available for customers.","Dies legt fest, ob der POSTPAY für Ihre Kunden verfügbar ist."
117
- "The MeinPaket server did not deliver a valid response. Have a look at the system log for more information.","Der MeinPaket-Server hat keine gültige Antwort für die Bestellungsabfrage geliefert. Für mehr Informationen zu diesem Problem, schauen Sie bitte im System-Log nach."
118
- "You are not authorized to execute the requested functionality on MeinPaket","Sie sind nicht berechtigt diese Funktionalität der MeinPaket-Plattform zu nutzen"
119
- "The provided data was incorrect","MeinPaket konnte die gegebenen Daten nicht akzeptieren"
120
- "The requested modification is not allowed. Please contact the MeinPaket support team","Diese Modifikation ist nicht erlaubt. Bitte kontaktieren Sie das MeinPaket Support Team"
121
  "The product is not mapped to neither a marketplace nor a shop category","Dieses Produkt ist weder einer Markplatzkategorie noch einer Shopkategorie zugewiesen"
122
- "The referenced product cannot be sold","Das Produkt kann nicht auf MeinPaket verkauft werden"
123
- "The referenced marketplace category could not be found at MeinPaket","Die angegebene Marktplatzkategorie kann auf MeinPaket nicht gefunden werden. Bitte importieren Sie die Marktplatzkategorien erneut, um auf dem aktuellen Stand zu arbeiten"
124
- "The referenced shop category could not be found at MeinPaket","Die angegebene Shop-Kategorie konnte bei MeinPaket nicht gefunden werden"
125
- "Default Shipment Method","Standard Versandmethode"
126
- "Shipment method which is used for order import and POSTPAY.","Versandmethode, die beim Import von MeinPaket-Bestellungen und für POSTPAY verwendet wird."
127
- "Submit shipping costs for POSTPAY","Versandkosten übertragen"
128
- "If set to yes, the shippingscosts for the POSTPAY will be calculated based on the default shipment method.","Legt fest, ob die Versandkosten basierend auf der eingestellten Standard Liefermethode mit übertragen werden."
129
- "Error on POSTPAY","Fehler bei POSTPAY"
130
- "The current version of POSTPAY does not support configurable products.","POSTPAY unterstützt in der aktuellen Version keine konfigurierbaren Produkte."
131
- "attribute mapping","Attribut-Mapping"
132
- "Attribute Mapping","Attribut-Mapping"
133
- "Attribute mappings","Attribut-Mappings"
134
- "Attribute Mappings","Attribut-Mappings"
135
- "Add Attribute Mapping","Neues Attribut-Mapping"
136
- "Save Mapping","Mapping speichern"
137
- "Create Attribute Mapping","Neues Attribut-Mapping anlegen"
138
- "Edit Attribute Mapping","Attribut-Mapping bearbeiten"
139
- "Magento Attribute Set","Magento Attribut-Set"
140
- "Please select attribute set and variant.","Bitte wählen Sie ein Attribut-Set und eine Varianten-Konfiguration aus."
141
- "MeinPaket Variant Configuration","MeinPaket Varianten-Konfiguration"
142
- "_Custom_","_Benutzerdefiniert_"
143
- "not assigned","nicht zugewiesen"
144
- "Magento Attribute","Magento-Attribut"
145
- "MeinPaket Attribute","MeinPaket-Attribut"
146
- "Magento Value","Magento-Wert"
147
- "MeinPaket Value","MeinPaket-Wert"
148
- "Edit Value Mapping","bearbeiten"
149
- "Delete Mapping","löschen"
150
- "No mapable attribute values available for the selected MeinPaket attribute.","Für das ausgewählte MeinPaket-Attribut existieren keine zuweisbaren Attribut-Werte."
151
- "Magento attribute values will be used instead.","Es werden direkt die Werte des Magento-Attributes verwendet."
152
- "_Auto_","_Automatisch_"
153
- "Apply a mapping for the following MeinPaket attributes","Bitte legen Sie für folgenden MeinPaket-Attribute ein Attribut-Mapping fest"
154
- "A mapping for the Magento attribute set already exists.","Ein Mapping für das ausgewählte Attribut-Set existiert bereits."
155
- "Your shopping cart contains product types that can not be handled by POSTPAY.","Ihr Einkaufswagen enthält Produkttypen, die von POSTPAY nich verarbeitet werden können."
156
- "Not available.","Nicht verfügbar."
157
- "Product export failed for unknown reason.","Der Produktexport ist aus einem unbekannten Grund fehlgeschlagen."
158
- "Missing value mapping for attribute","Fehlende Wertezuweisung für Attribut"
159
- "Default customer email","Standard Kunden-E-Mail-Adresse"
160
- "Customer","Kunde"
161
  "This eMail address is used as the default one for orders that do not include one.","Diese E-Mail-Adresse wird als Standard-Adresse für Bestellungen verwendet, für die keine Kunden-E-Mail-Adresse geliefert wird."
162
- "The following configurable products could not be exported","Die folgenden konfigurierbaren Produkte konnten nicht exportiert werden"
163
- "Ivalid modification of element","Unerlaubte Modifikation des Elementes"
164
- "Variant group does not exist on MeinPaket","Die verwendeten Produktattribute sind als MeinPaket-Variantenkonfiguration nicht bekannt."
165
- "Color","Farbe"
166
- "Size","Größe"
167
- "Dimension","Abmessung"
168
- "Quantity","Anzahl"
169
  "Width","Breite"
170
- "Format","Format"
171
- "Material","Material"
172
- "Length","Länge"
173
- "Flavor","Geschmacksrichtung"
174
- "Inscription","Beschriftung"
175
- "Model","Modell"
176
- "Platform","Plattform"
177
- "Radius","Radius"
178
- "Strength","Stärke"
179
- "Diameter","Durchmesser"
180
- "Cylinder","Zylinder"
181
- "Axis","Achse"
182
- "Bust Measurement",Brustumfang
183
- "Cup","Cup"
184
- "Meinpaket Active","Meinpaket aktivieren"
185
- "Disable Postpay using Configuration / Payment Methods / Postpay Standard and Postpay Express.","Deaktivierung von Postpay unter Konfiguration / Bezahlmethoden / Postpay Standard und Postpay Express."
1
+ "Added %s new categories.","Es wurden %s neue Kategorien angelegt."
2
+ "Advanced (only Allyouneed)","Fortgeschritten (nur Allyouneed)"
 
 
 
 
 
 
 
3
  "all","Alle"
4
+ "Allyouneed Active","Allyouneed aktivieren"
5
+ "Allyouneed Attribute","Allyouneed-Attribut"
6
+ "Axis","Achse"
7
+ "BestPrice Interval (only Allyouneed)","BestPrice Intervall (nur Allyouneed)"
8
+ "BestPrice refresh interval.","Intervall für BestPrice Aktualisierung."
9
  "best prices","Beste Preise"
10
+ "Bust Measurement",Brustumfang
11
+ "Category","Kategorie"
12
+ "Color","Farbe"
13
+ "Connecting to Allyouneed server failed.","Die Verbindung zum Allyouneed-Server konnte nicht aufgebaut werden."
14
+ "Connection to Allyouneed server timed out.","Zeitüberschreitung beim Verbindungsaufbau zu Allyouneed-Server."
15
+ "Count of products transfered during a single cycle","Anzahl der Produkte, die in einem Durchlauf übertragen werden"
16
+ "Credentials","Zugangsdaten"
17
+ "Cup","Cup"
18
+ "Customer (nur Allyouneed)","Kunde (nur Allyouneed)"
19
+ "Cycle product count","Anzahl Produkte pro Durchlauf"
20
+ "Cylinder","Zylinder"
21
+ "Default customer email","Standard Kunden Email"
22
+ "Default delivery time","Standard-Lieferzeit"
23
  "Default tax rate","Standard-Steuersatz"
24
+ "Deleted categories","Gelöschte Kategorien"
25
+ "Deleted %s categories.","Es wurden %s Kategorien gelöscht, die im Allyouneed-Marktplatz nicht mehr verfügbar sind."
26
+ "Delivery time attribute","Attribut für Lieferzeit"
27
+ "Delivery time in days if no other delivery time applies","Lieferzeit in Tagen, wenn keine andere Lieferzeit angegeben wird"
 
 
 
 
28
  "Delivery time","Lieferzeit (in Tagen)"
29
+ "Diameter","Durchmesser"
30
+ "Dimension","Abmessung"
31
+ "Disable Postpay using Configuration / Payment Methods / Postpay Standard and Postpay Express.","Deaktivierung von Postpay unter Konfiguration / Bezahlmethoden / Postpay Standard und Postpay Express."
32
+ "edit product","Produkt bearbeiten"
33
+ "Error","Fehler"
34
+ "Flavor","Geschmacksrichtung"
35
+ "Format","Format"
36
+ "Import Categories","Allyouneed Kategorien importieren"
37
+ "import categories","Kategorien importieren"
38
+ "Inscription","Beschriftung"
39
+ "Internal error on Allyouneed server","Interner Fehler auf Allyouneed-Server",
40
+ "Invalid modification of element","Unerlaubte Modifikation des Elementes"
41
+ "Invalid response from Allyouneed server.","Ungültige Antwort von Allyouneed-Server erhalten."
42
  "Invalid value for field","Ungültiger Wert für Feld"
43
+ "Length","Länge"
44
+ "Marketplace category structure was up to date. There have been no changes.","Markplatz-Kategoriestruktur ist auf dem neuesten Stand."
45
+ "Material","Material"
46
  "Missing value for field","Fehlender Wert für Feld"
47
+ "Model","Modell"
48
+ "New categories","Neue Kategorien"
49
+ "Overview","Übersicht"
50
+ "Platform","Plattform"
51
+ "Please select the product attribute which represents the approx. delivery time","Bitte wählen Sie die Produkteigenschaft, welche die Lieferzeit angibt."
 
 
 
 
 
 
 
 
 
 
52
  "please wait","Bitte warten...",
53
+ "Product attribute containing EAN","Produktattribut der EAN"
54
+ "Product attributes (only Allyouneed)","Produktattribute (nur Allyouneed)"
55
+ "Product attributes","Produkteigenschaften"
56
+ "Product export failed. Failed connecting to Allyouneed server.","Produktexport fehlgeschlagen: Konnte keine Verbindung zu Allyouneed aufgebaut werden."
57
+ "Product export failed for unknown reason.","Der Produktexport ist aus einem unbekannten Grund fehlgeschlagen."
58
+ "Product export interval","Intervall für Produktexport"
59
+ "Product Export (only Allyouneed)","Produkt Export (nur Allyouneed)"
60
+ "Product is unknown in Allyouneed marketplace","Produkt ist im Allyouneed Marktplatz nicht bekannt"
 
 
 
 
61
  "Product stock is lower than zero.","Der Lagerbestand für dieses Produkt ist im negativen Bereich."
62
+ "Quantity","Anzahl"
63
+ "Radius","Radius"
64
+ "Reduced tax rate","Reduzierter Steuersatz"
 
 
 
 
 
 
 
 
 
 
65
  "Renamed %s categories.","Es wurden %s Kategorien umbenannt."
66
+ "Result","Ergebnis"
67
+ "Size","Größe"
68
+ "%s of %s products were successfully exported","%s von %s Produkten wurden erfolgreich exportiert"
69
+ "start again","nochmal starten"
70
+ "Strength","Stärke"
71
+ "Successfully imported marketplace categories.","Die Marktplatz-Kategorien wurden erfolgreich mit Allyouneed abgeglichen."
72
+ "Tax rates (nur Allyouneed)","Steuersätze (nur Allyouneed)"
73
+ "Tax rates","Steuersätze"
74
+ "Textual introduction into category import goes here...","<b>Hier können Sie die Marktplatzkategorien von Allyouneed importieren.</b><p>Wenn Sie die Allyouneed-Marktplatzkategorien schon einmal importiert haben, werden diese nicht überschrieben, sondern nur mögliche Änderungen und Ergänzungen vorgenommen. Produkte, die Sie bereits Allyouneed-Marktplatzkategorien zugeordnet haben, bleiben weiterhin diesen Kategorien zugeordnet. Produkte, deren Kategorie gelöscht wurde, müssen vor einer erneuten Übertragung neu einer Kategorie zugewiesen werden.</p><p>Starten Sie den Importvorgang durch Betätigen des &bdquo;<i>Kategorien importieren</i>&rdquo;-Buttons. Der Vorgang kann einige Minuten dauern. Brechen Sie den Vorgang nicht ab.</p>"
75
+ "The default tax rate applies to most products","Dieser Steuersatz gilt für die meisten Produkte."
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
76
  "The product is not mapped to neither a marketplace nor a shop category","Dieses Produkt ist weder einer Markplatzkategorie noch einer Shopkategorie zugewiesen"
77
+ "The provided data was incorrect","Allyouneed konnte die gegebenen Daten nicht akzeptieren"
78
+ "The reduced tax rate applies to special products, such as aliments","Der reduzierte Steuersatz, der für spezielle Produkte - etwa Nahrungsmittel - gilt."
79
+ "The referenced marketplace category could not be found at Allyouneed","Die angegebene Marktplatzkategorie kann auf Allyouneed nicht gefunden werden. Bitte importieren Sie die Marktplatzkategorien erneut, um auf dem aktuellen Stand zu arbeiten"
80
+ "The referenced product cannot be sold","Das Produkt kann nicht auf Allyouneed verkauft werden"
81
+ "The referenced shop category could not be found at Allyouneed","Die angegebene Shop-Kategorie konnte bei Allyouneed nicht gefunden werden"
82
+ "There were no products that could be exported.","Es konnten keine Produkte exportiert werden."
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
83
  "This eMail address is used as the default one for orders that do not include one.","Diese E-Mail-Adresse wird als Standard-Adresse für Bestellungen verwendet, für die keine Kunden-E-Mail-Adresse geliefert wird."
84
+ "total","gesamt"
85
+ "Unknown error","Es ist ein unbekannter Fehler aufgetreten"
86
+ "Use product special price if available","Verwende den Sonderpreis, wenn ein solcher vorhanden ist"
87
+ "Use special price if available","Verwende Sonderpreis, wenn vorhanden"
88
+ "Variant group does not exist on Allyouneed","Die verwendeten Produktattribute sind als Allyouneed-Variantenkonfiguration nicht bekannt."
 
 
89
  "Width","Breite"
90
+ "You are not authorized to execute the requested functionality on Allyouneed","Sie sind nicht berechtigt diese Funktionalität der Allyouneed-Plattform zu nutzen"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/locale/de_DE/Dhl_MeinPaketCommon.csv CHANGED
@@ -1,183 +1,65 @@
1
- "import Variantconfigurations","Variantenkonfigurationen importieren"
2
  "Credentials","Zugangsdaten"
3
- "export products","Produkte exportieren"
4
- "import orders","Bestellungen importieren"
5
- "import categories","Kategorien importieren"
6
- "list products","Produkte anzeigen"
7
- "select products","Produktauswahl angeben"
8
- "edit product","Produkt bearbeiten"
9
- "only marked products", "Nur ausgewählte Produkte"
10
  "all","Alle"
11
- "start again","nochmal starten"
12
- "best prices","Beste Preise"
13
- "DHL Username","Benutzername"
14
  "This is the username that was given to you by DHL, mostly your email address.","Dies ist der Benutzername, der Ihnen von DHL mitgeteilt wurde. Meisst ist dies Ihre E-Mail Adresse."
15
- "DHL Password","Passwort"
16
  "This is the password that was given to you by DHL.","Dies ist das Passwort, das Ihnen von DHL mitgeteilt wurde."
17
  "Remote system","Entferntes System"
18
- "This is the address of the remote API.","Dies ist die Adresse der entfernten API."
19
- "Tax rates","Steuersätze"
20
- "Default tax rate","Standard-Steuersatz"
21
- "The default tax rate applies to most products","Dieser Steuersatz gilt für die meissten Produkte."
22
- "Reduced tax rate","reduzierter Steuersatz"
23
- "The reduced tax rate applies to special products, such as aliments","Der reduzierte Steuersatz, der für spezielle Produkte - etwa Nahrungsmittel - gilt."
24
- "Shop tree root","Shop Hauptkategorie"
25
- "Marketplace tree root","Marktplatz Hauptkategorie"
26
- "Sync with MeinPaket.de","mit MeinPaket.de abgleichen"
27
- "Maximum stock qty. for MeinPaket.de","maximale Stückzahl für MeinPaket.de"
28
- "Product attributes","Produkteigenschaften"
29
- "Delivery time","Lieferzeit (in Tagen)"
30
- "Please select the product attribute which represents the approx. delivery time","Bitte wählen Sie die Produkteigenschaft, welche die Lieferzeit angibt."
31
- "Default delivery time","Standard-Lieferzeit"
32
- "Delivery time in days if no other delivery time applies","Lieferzeit in Tagen, wenn keine andere Lieferzeit angegeben."
33
- "Marketplace category ID","Marktplatz-Kategorie"
34
- "These products could not be exported","Die folgenden Produkte konnten aufgrund von Fehlern nicht exportiert werden"
35
- "Result","Ergebnis"
36
- "Selection","Auswahl"
37
- "Upload","Upload"
38
- "Common Errors","Allgemeine Fehler"
39
- "Product","Produkt"
40
- "Edit Product","Produkt bearbeiten"
41
- "Error Description","Fehlerbeschreibung"
42
  "Invalid value for field","Ungültiger Wert für Feld"
43
  "Missing value for field","Fehlender Wert für Feld"
44
- "The following products could only be exported as description","Für die folgenden Produkte konnten nur Angebote eingestellt werden"
45
- "Unknown Error","Unbekannter Fehler"
46
- "Product is unknown in MeinPaket marketplace","Produkt ist im MeinPaket Marktplatz nicht bekannt"
47
- "Successfully Exported Products","Erfolgreich exportierte Produkte"
48
- "total","gesamt"
49
- "of","von"
50
- "%s of %s products were successfully exported","%s von %s Produkten wurden erfolgreich exportiert"
51
- "At this place you can choose which products you want to export and start the process.","<b>Hier können Sie Produkte Ihres Magento-Shops nach MeinPaket.de exportieren.</b><p>Wählen Sie in der Auswahlliste unten den Punkt &bdquo;<i>Nur ausgewählte Produkte</i>&rdquo;, um nur die Produkte zu exportieren, deren &bdquo;<i>mit MeinPaket.de abgleichen</i>&rdquo;-Attribut explizit auf &bdquo;<i>Ja</i>&rdquo; gesetzt wurde. Dieses Attribut können Sie in den Produktinformationen im Reiter &bdquo;<i>Allgemein</i>&rdquo; bearbeiten.</p><p>Um alle Produkte Ihres Magento-Shops nach MeinPaket.de zu exportieren, wählen Sie &bdquo;<i>Alle</i>&rdquo; in der unten stehenden Auswahlliste. Berücksichtigt werden hierbei nur Produkte, die einer MeinPaket.de-Marktplatzkategorie zugeordnet sind.</p><p>Sie starten den Vorgang durch Betätigen des &bdquo;<i>Produkte exportieren</i>&rdquo;-Buttons. Dadurch springt der Export in den Upload-Modus. Unterbrechen Sie den Prozess während dessen nicht.</p><p>Wenn alle ausgewählten Produkte an MeinPaket übermittelt wurden, sehen Sie eine Übersicht aller exportierter Produkte sowie eine detaillierte Auflistung aller während des Vorgangs aufgetretenen Fehler.</p>"
52
  "Skipped %s duplicate orders that were already imported previously.","%s Bestellungen übersprungen, die bereits zu einem früheren Zeitpunkt importiert wurden."
53
  "Skipped %s duplicate order that was already imported previously.","%s Bestellung übersprungen, die bereits zu einem früheren Zeitpunkt importiert wurde."
54
  "%s order(s) sucessfully imported.","%s Bestellung(en) erfolgreich importiert."
55
- "start date","Startdatum"
56
- "end date","Enddatum"
57
- "Textual guide for importing orders follows here","<b>Hier können Sie Bestellungen importieren, die Käufer auf MeinPaket.de getätigt haben.</b><p>Legen Sie mit Hilfe der Felder &bdquo;<i>Startdatum</i>&rdquo; und &bdquo;<i>Enddatum</i>&rdquo; einen Zeitraum fest, für den Sie Bestellungen von MeinPaket.de importieren möchten. Sie können das Feld &bdquo;<i>Enddatum</i>&rdquo; leer lassen, um alle Bestellungen vom &bdquo;<i>Startdatum</i>&rdquo; bis zum jetzigen Zeitpunkt zu importieren.</p><p>Starten Sie den Vorgang durch Betätigen des &bdquo;<i>Bestellungen importieren</i>&rdquo;-Buttons. Warten Sie, bis der Vorgang abgeschlossen ist. Sie sehen im Anschluss einen Statusbericht über die importierten Bestellungen.</p>"
58
- "leave empty to load all till now","leer lassen, um alles bis jetzt zu laden"
59
- "please wait","Bitte warten...",
60
- "view orders","Bestellungen ansehen"
61
- "Finished","Abgeschlossen"
62
- "Import Products","Bestellungen importieren"
63
- "Import Categories","MeinPaket.de Kategorien importieren"
64
- "Category import completed.","Der Import der MeinPaket.de Marktplatz-Kategorien wurde abgeschlossen."
65
- "Textual introduction into category import goes here...","<b>Hier können Sie die Marktplatzkategorien von MeinPaket.de importieren. Die Kategorien finden Sie im Anschluss unter der Kategorie &bdquo;<i>MeinPaket.de marketplace</i>&rdquo; auf der obersten Ebene Ihres Magento-Kategoriebaumes.</b><p>Wenn Sie die MeinPaket.de-Marktplatzkategorien schon einmal importiert haben, werden diese nicht überschrieben, sondern nur mögliche Änderungen und Ergänzungen vorgenommen. Produkte, die Sie bereits MeinPaket.de-Marktplatzkategorien zugeordnet haben, bleiben weiterhin diesen Kategorien zugeordnet.</p><p>Starten Sie den Importvorgang durch Betätigen des &bdquo;<i>Kategorien importieren</i>&rdquo;-Buttons. Der Vorgang kann einige Minuten dauern. Brechen Sie den Vorgang nicht ab.</p>"
66
- "Product export failed. Failed connecting to MeinPaket server.","Produktexport fehlgeschlagen: Konnte keine Verbindung zu MeinPaket.de aufgebaut werden."
67
  "No new orders found.","Es wurden keine neuen Bestellungen gefunden."
68
- "Skipped %s order(s) because: out of stock. Please process the following order(s) at your MeinPaket.de dealer area:","%s Bestellung(en) übersprungen, da nicht auf Lager. Bitte bearbeiten Sie die folgende(n) Bestellung(en) in Ihrem MeinPaket Händlerbereich:"
69
- "Skipped %s order(s) because: some or all of the included products were disabled in Magento after the export to MeinPaket.de . Please process the following order(s) at your MeinPaket.de dealer area:","%s Bestellung(en) übersprungen, da sie Produkte enthielten, die nachträglich zum Export nach MeinPaket.de in Magento deaktiviert wurden. Bitte bearbeiten Sie die folgende(n) Bestellung(en) in Ihrem MeinPaket Händlerbereich:"
70
- "%s was ordered with a different price (%s instead of current price %s). Was the price changed after exporting to MeinPaket.de?","%s wurde zu einem anderen Preis bestellt (%s statt aktuellem Preis %s). Wurde der Preis nachträglich nach dem Export zu MeinPaket.de geändert?"
71
- "Internal error on MeinPaket server","Interner Fehler auf MeinPaket-Server",
72
  "Product stock is lower than zero.","Der Lagerbestand für dieses Produkt ist im negativen Bereich."
73
- "Overview","Übersicht"
74
- "Category","Kategorie"
75
- "Old name","Alter Name"
76
- "Edit Category","Kategorie bearbeiten"
77
- "New categories","Neue Kategorien"
78
- "Renamed categories","Umbenannte Kategorien"
79
- "Deleted categories","Gelöschte Kategorien"
80
- "Successfully imported marketplace categories.","Die Marktplatz-Kategorien wurden erfolgreich mit MeinPaket.de abgeglichen."
81
- "Connecting to MeinPaket.de server failed.","Die Verbindung zum MeinPaket.de-Server konnte nicht aufgebaut werden."
82
- "Connection to MeinPaket.de server timed out.","Der MeinPaket.de-Server antwortet nicht."
83
  "Unknown error","Es ist ein unbekannter Fehler aufgetreten"
84
  "Error","Fehler"
85
- "Added %s new categories.","Es wurden %s neue Kategorien angelegt."
86
- "Renamed %s categories.","Es wurden %s Kategorien umbenannt."
87
- "Deleted %s categories.","Es wurden %s Kategorien gelöscht, die im MeinPaket.de-Marktplatz nicht mehr verfügbar sind."
88
- "Marketplace category structure was up to date. There have been no changes.","Markplatz-Kategoriestruktur ist auf dem neuesten Stand."
89
- "Imported from DHL MeinPaket.de","Importiert von MeinPaket.de"
90
- "MeinPaket.de Order No.","MeinPaket.de Best.Nr."
91
  "Request could not be built.","Die Anfrage konnte nicht generiert werden."
92
- "MeinPaket.de server returned HTPP code %s.","Der MeinPaket.de-Server hat den HTTP-Fehlercode %s zurückgeliefert."
93
- "Connection to MeinPaket.de server timed out.","Zeitüberschreitung beim Verbindungsaufbau zu MeinPaket.de-Server."
94
- "Invalid response from MeinPaket.de server.","Ungültige Antwort von MeinPaket.de-Server erhalten."
95
- "Error on tranfering cancelled items to MeinPaket.de.","Bei der Stornierung der Bestellpositionen bei MeinPaket.de ist ein Fehler aufgetreten."
96
- "MeinPaket.de server returned error code %s.","Der MeinPaket.de-Server hat den Fehlercode %s zurückgegeben."
97
- "Shipment has not been accepted by MeinPaket.de.","Die Lieferung wurde von MeinPaket.de nicht akzeptiert."
98
- "Error on transfering shipment to MeinPaket.de.","Fehler beim Senden der Lieferinformationen zu MeinPaket.de."
99
- "Refund has not been accepted by MeinPaket.de.","Die Gutschrift wurde nicht von MeinPaket.de akzeptiert."
100
- "Error on transfering refund to MeinPaket.de.","Fehler beim Senden der Gutschrift an MeinPaket.de."
101
- "Tracking code has not been accepted by MeinPaket.de.","Der gesendete Tracking-Code für diese Lieferung wurde von MeinPaket.de nicht akzeptiert."
102
- "MeinPaket.de returned error code %s.","MeinPaket.de lieferte den Fehler-Code %s zurück."
103
- "Error on transfering tracking code to MeinPaket.de.","Fehler beim Senden des Tracking-Codes am MeinPaket.de."
104
- "There were no products that could be exported.","Es konnten keine Produkte exportiert werden."
105
- "Product information has not been accepted by MeinPaket.de.","Die Produktinformationen wurden von MeinPaket.de nicht akzeptiert."
106
- "Error on transfering product information to MeinPaket.de.","Fehler beim Exportieren des Produktes nach MeinPaket.de."
107
- "Thank you for your order!","Vielen Dank für Ihre Bestellung!"
108
- "Your order was successfully processed at MeinPaket.de. We will recieve your order shortly.","Ihre Bestellung wurde bei MeinPaket.de erfogreich bearbeitet. Wir werden Ihre Bestellung in Kürze erhalten."
109
- "Ooops!","Uuups!"
110
- "Something has gone terribly wrong while processing your order at MeinPaket.de! Please contact our customer service.","Etwas ist schiefgelaufen, während Ihre Bestellung bei MeinPaket.de bearbeitet wurde. Bitte kontaktieren Sie unseren Kundenservice!"
111
- "Checkout aborted!","Bestellvorgang abgebrochen!"
112
- "You decided to abort the external checkout at DHL MeinPaket. Your order has NOT been processed yet. Feel free to continue shopping and use our own checkout.","Sie haben den POSTPAY abgebrochen. Ihre Bestellung wurde noch NICHT verabeitet. Gerne können Sie Ihren Einkauf fortsetzen und unseren Checkout nutzen."
113
- "Continue shopping","Einkauf fortsetzen"
114
- "Checkout","Checkout"
115
- "POSTPAY available","POSTPAY anbieten"
116
- "This defines wether the external Checkout with DHL is available for customers.","Dies legt fest, ob der POSTPAY für Ihre Kunden verfügbar ist."
117
- "The MeinPaket server did not deliver a valid response. Have a look at the system log for more information.","Der MeinPaket-Server hat keine gültige Antwort für die Bestellungsabfrage geliefert. Für mehr Informationen zu diesem Problem, schauen Sie bitte im System-Log nach."
118
- "You are not authorized to execute the requested functionality on MeinPaket","Sie sind nicht berechtigt diese Funktionalität der MeinPaket-Plattform zu nutzen"
119
- "The provided data was incorrect","MeinPaket konnte die gegebenen Daten nicht akzeptieren"
120
- "The requested modification is not allowed. Please contact the MeinPaket support team","Diese Modifikation ist nicht erlaubt. Bitte kontaktieren Sie das MeinPaket Support Team"
121
  "The product is not mapped to neither a marketplace nor a shop category","Dieses Produkt ist weder einer Markplatzkategorie noch einer Shopkategorie zugewiesen"
122
- "The referenced product cannot be sold","Das Produkt kann nicht auf MeinPaket verkauft werden"
123
- "The referenced marketplace category could not be found at MeinPaket","Die angegebene Marktplatzkategorie kann auf MeinPaket nicht gefunden werden. Bitte importieren Sie die Marktplatzkategorien erneut, um auf dem aktuellen Stand zu arbeiten"
124
- "The referenced shop category could not be found at MeinPaket","Die angegebene Shop-Kategorie konnte bei MeinPaket nicht gefunden werden"
125
  "Default Shipment Method","Standard Versandmethode"
126
- "Shipment method which is used for order import and POSTPAY.","Versandmethode, die beim Import von MeinPaket-Bestellungen und für POSTPAY verwendet wird."
127
- "Submit shipping costs for POSTPAY","Versandkosten übertragen"
128
- "If set to yes, the shippingscosts for the POSTPAY will be calculated based on the default shipment method.","Legt fest, ob die Versandkosten basierend auf der eingestellten Standard Liefermethode mit übertragen werden."
129
- "Error on POSTPAY","Fehler bei POSTPAY"
130
- "The current version of POSTPAY does not support configurable products.","POSTPAY unterstützt in der aktuellen Version keine konfigurierbaren Produkte."
131
- "attribute mapping","Attribut-Mapping"
132
- "Attribute Mapping","Attribut-Mapping"
133
- "Attribute mappings","Attribut-Mappings"
134
- "Attribute Mappings","Attribut-Mappings"
135
- "Add Attribute Mapping","Neues Attribut-Mapping"
136
  "Save Mapping","Mapping speichern"
137
- "Create Attribute Mapping","Neues Attribut-Mapping anlegen"
138
- "Edit Attribute Mapping","Attribut-Mapping bearbeiten"
139
- "Magento Attribute Set","Magento Attribut-Set"
140
- "Please select attribute set and variant.","Bitte wählen Sie ein Attribut-Set und eine Varianten-Konfiguration aus."
141
- "MeinPaket Variant Configuration","MeinPaket Varianten-Konfiguration"
142
- "_Custom_","_Benutzerdefiniert_"
143
- "not assigned","nicht zugewiesen"
144
- "Magento Attribute","Magento-Attribut"
145
- "MeinPaket Attribute","MeinPaket-Attribut"
146
- "Magento Value","Magento-Wert"
147
- "MeinPaket Value","MeinPaket-Wert"
148
- "Edit Value Mapping","bearbeiten"
149
- "Delete Mapping","löschen"
150
- "No mapable attribute values available for the selected MeinPaket attribute.","Für das ausgewählte MeinPaket-Attribut existieren keine zuweisbaren Attribut-Werte."
151
- "Magento attribute values will be used instead.","Es werden direkt die Werte des Magento-Attributes verwendet."
152
- "_Auto_","_Automatisch_"
153
- "Apply a mapping for the following MeinPaket attributes","Bitte legen Sie für folgenden MeinPaket-Attribute ein Attribut-Mapping fest"
154
- "A mapping for the Magento attribute set already exists.","Ein Mapping für das ausgewählte Attribut-Set existiert bereits."
155
- "Your shopping cart contains product types that can not be handled by POSTPAY.","Ihr Einkaufswagen enthält Produkttypen, die von POSTPAY nich verarbeitet werden können."
156
- "Not available.","Nicht verfügbar."
157
- "Product export failed for unknown reason.","Der Produktexport ist aus einem unbekannten Grund fehlgeschlagen."
158
  "Missing value mapping for attribute","Fehlende Wertezuweisung für Attribut"
159
  "Default customer email","Standard Kunden-E-Mail-Adresse"
160
  "Customer","Kunde"
161
  "This eMail address is used as the default one for orders that do not include one.","Diese E-Mail-Adresse wird als Standard-Adresse für Bestellungen verwendet, für die keine Kunden-E-Mail-Adresse geliefert wird."
162
- "The following configurable products could not be exported","Die folgenden konfigurierbaren Produkte konnten nicht exportiert werden"
163
- "Ivalid modification of element","Unerlaubte Modifikation des Elementes"
164
- "Variant group does not exist on MeinPaket","Die verwendeten Produktattribute sind als MeinPaket-Variantenkonfiguration nicht bekannt."
165
- "Color","Farbe"
166
- "Size","Größe"
167
- "Dimension","Abmessung"
168
- "Quantity","Anzahl"
169
- "Width","Breite"
170
- "Format","Format"
171
- "Material","Material"
172
- "Length","Länge"
173
- "Flavor","Geschmacksrichtung"
174
- "Inscription","Beschriftung"
175
- "Model","Modell"
176
- "Platform","Plattform"
177
- "Radius","Radius"
178
- "Strength","Stärke"
179
- "Diameter","Durchmesser"
180
- "Cylinder","Zylinder"
181
- "Axis","Achse"
182
- "Bust Measurement",Brustumfang
183
- "Cup","Cup"
 
1
  "Credentials","Zugangsdaten"
 
 
 
 
 
 
 
2
  "all","Alle"
3
+ "Username","Benutzername"
 
 
4
  "This is the username that was given to you by DHL, mostly your email address.","Dies ist der Benutzername, der Ihnen von DHL mitgeteilt wurde. Meisst ist dies Ihre E-Mail Adresse."
5
+ "Password","Passwort"
6
  "This is the password that was given to you by DHL.","Dies ist das Passwort, das Ihnen von DHL mitgeteilt wurde."
7
  "Remote system","Entferntes System"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
8
  "Invalid value for field","Ungültiger Wert für Feld"
9
  "Missing value for field","Fehlender Wert für Feld"
10
+ "Product is unknown in Allyouneed marketplace","Produkt ist im Allyouneed Marktplatz nicht bekannt"
 
 
 
 
 
 
 
11
  "Skipped %s duplicate orders that were already imported previously.","%s Bestellungen übersprungen, die bereits zu einem früheren Zeitpunkt importiert wurden."
12
  "Skipped %s duplicate order that was already imported previously.","%s Bestellung übersprungen, die bereits zu einem früheren Zeitpunkt importiert wurde."
13
  "%s order(s) sucessfully imported.","%s Bestellung(en) erfolgreich importiert."
 
 
 
 
 
 
 
 
 
 
 
 
14
  "No new orders found.","Es wurden keine neuen Bestellungen gefunden."
15
+ "Skipped %s order(s) because: out of stock. Please process the following order(s) at your Allyouneed dealer area:","%s Bestellung(en) übersprungen, da nicht auf Lager. Bitte bearbeiten Sie die folgende(n) Bestellung(en) in Ihrem Allyouneed Händlerbereich:"
16
+ "Skipped %s order(s) because: some or all of the included products were disabled in Magento after the export to Allyouneed . Please process the following order(s) at your Allyouneed dealer area:","%s Bestellung(en) übersprungen, da sie Produkte enthielten, die nachträglich zum Export nach Allyouneed in Magento deaktiviert wurden. Bitte bearbeiten Sie die folgende(n) Bestellung(en) in Ihrem Allyouneed Händlerbereich:"
17
+ "%s was ordered with a different price (%s instead of current price %s). Was the price changed after exporting to Allyouneed?","%s wurde zu einem anderen Preis bestellt (%s statt aktuellem Preis %s). Wurde der Preis nachträglich nach dem Export zu Allyouneed geändert?"
18
+ "Internal error on Allyouneed server","Interner Fehler auf Allyouneed-Server",
19
  "Product stock is lower than zero.","Der Lagerbestand für dieses Produkt ist im negativen Bereich."
 
 
 
 
 
 
 
 
 
 
20
  "Unknown error","Es ist ein unbekannter Fehler aufgetreten"
21
  "Error","Fehler"
22
+ "Connection to Allyouneed server timed out.","Zeitüberschreitung beim Verbindungsaufbau zu Allyouneed-Server."
23
+ "Imported from DHL Allyouneed","Importiert von Allyouneed"
24
+ "Allyouneed Order No.","Allyouneed Best.Nr."
 
 
 
25
  "Request could not be built.","Die Anfrage konnte nicht generiert werden."
26
+ "Allyouneed server returned HTPP code %s.","Der Allyouneed-Server hat den HTTP-Fehlercode %s zurückgeliefert."
27
+ "Invalid response from Allyouneed server.","Ungültige Antwort von Allyouneed-Server erhalten."
28
+ "Error on tranfering cancelled items to Allyouneed.","Bei der Stornierung der Bestellpositionen bei Allyouneed ist ein Fehler aufgetreten."
29
+ "Allyouneed server returned error code %s.","Der Allyouneed-Server hat den Fehlercode %s zurückgegeben."
30
+ "Shipment has not been accepted by Allyouneed.","Die Lieferung wurde von Allyouneed nicht akzeptiert."
31
+ "Error on transfering shipment to Allyouneed.","Fehler beim Senden der Lieferinformationen zu Allyouneed."
32
+ "Refund has not been accepted by Allyouneed.","Die Gutschrift wurde nicht von Allyouneed akzeptiert."
33
+ "Error on transfering refund to Allyouneed.","Fehler beim Senden der Gutschrift an Allyouneed."
34
+ "Tracking code has not been accepted by Allyouneed.","Der gesendete Tracking-Code für diese Lieferung wurde von Allyouneed nicht akzeptiert."
35
+ "Allyouneed returned error code %s.","Allyouneed lieferte den Fehler-Code %s zurück."
36
+ "Error on transfering tracking code to Allyouneed.","Fehler beim Senden des Tracking-Codes am Allyouneed."
37
+ "The Allyouneed server did not deliver a valid response. Have a look at the system log for more information.","Der Allyouneed-Server hat keine gültige Antwort für die Bestellungsabfrage geliefert. Für mehr Informationen zu diesem Problem, schauen Sie bitte im System-Log nach."
38
+ "You are not authorized to execute the requested functionality on Allyouneed","Sie sind nicht berechtigt diese Funktionalität der Allyouneed-Plattform zu nutzen"
39
+ "The provided data was incorrect","Allyouneed konnte die gegebenen Daten nicht akzeptieren"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
40
  "The product is not mapped to neither a marketplace nor a shop category","Dieses Produkt ist weder einer Markplatzkategorie noch einer Shopkategorie zugewiesen"
41
+ "The referenced product cannot be sold","Das Produkt kann nicht auf Allyouneed verkauft werden"
42
+ "The referenced marketplace category could not be found at Allyouneed","Die angegebene Marktplatzkategorie kann auf Allyouneed nicht gefunden werden. Bitte importieren Sie die Marktplatzkategorien erneut, um auf dem aktuellen Stand zu arbeiten"
43
+ "The referenced shop category could not be found at Allyouneed","Die angegebene Shop-Kategorie konnte bei Allyouneed nicht gefunden werden"
44
  "Default Shipment Method","Standard Versandmethode"
45
+ "Shipment method which is used for order import and POSTPAY.","Versandmethode, die beim Import von Allyouneed-Bestellungen und für POSTPAY verwendet wird."
 
 
 
 
 
 
 
 
 
46
  "Save Mapping","Mapping speichern"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
47
  "Missing value mapping for attribute","Fehlende Wertezuweisung für Attribut"
48
  "Default customer email","Standard Kunden-E-Mail-Adresse"
49
  "Customer","Kunde"
50
  "This eMail address is used as the default one for orders that do not include one.","Diese E-Mail-Adresse wird als Standard-Adresse für Bestellungen verwendet, für die keine Kunden-E-Mail-Adresse geliefert wird."
51
+ "Invalid modification of element","Unerlaubte Modifikation des Elementes"
52
+ "Variant group does not exist on Allyouneed","Die verwendeten Produktattribute sind als Allyouneed-Variantenkonfiguration nicht bekannt."
53
+ "Store View","Shop-Ansicht"
54
+ "Use HTTPs","Verwende HTTPs"
55
+ "Use https:// to connect to DHL Allyouneed","Verwende https:// um die Verbindung zu DHL Allyouneed herzustellen"
56
+ "Use Sandbox","Verwende Sandbox"
57
+ "Use DHL Allyouneed sandbox","Verwende DHL Allyouneed Sandbox"
58
+ "Shipment","Sendung"
59
+ "Async Request","Asynchrone Aufrufe"
60
+ "Order Import","Bestellimport"
61
+ "Cleanup Interval","Intervall für Aufräumfunktionen"
62
+ "Use Proxy","Verwende Proxy"
63
+
64
+
65
+
 
 
 
 
 
 
 
app/locale/de_DE/Dhl_Postpay.csv CHANGED
@@ -1,184 +1,3 @@
1
- "import Variantconfigurations","Variantenkonfigurationen importieren"
2
- "Credentials","Zugangsdaten"
3
- "export products","Produkte exportieren"
4
- "import orders","Bestellungen importieren"
5
- "import categories","Kategorien importieren"
6
- "list products","Produkte anzeigen"
7
- "select products","Produktauswahl angeben"
8
- "edit product","Produkt bearbeiten"
9
- "only marked products", "Nur ausgewählte Produkte"
10
  "all","Alle"
11
- "start again","nochmal starten"
12
- "best prices","Beste Preise"
13
- "DHL Username","Benutzername"
14
- "This is the username that was given to you by DHL, mostly your email address.","Dies ist der Benutzername, der Ihnen von DHL mitgeteilt wurde. Meisst ist dies Ihre E-Mail Adresse."
15
- "DHL Password","Passwort"
16
- "This is the password that was given to you by DHL.","Dies ist das Passwort, das Ihnen von DHL mitgeteilt wurde."
17
- "Remote system","Entferntes System"
18
- "This is the address of the remote API.","Dies ist die Adresse der entfernten API."
19
- "Tax rates","Steuersätze"
20
- "Default tax rate","Standard-Steuersatz"
21
- "The default tax rate applies to most products","Dieser Steuersatz gilt für die meissten Produkte."
22
- "Reduced tax rate","reduzierter Steuersatz"
23
- "The reduced tax rate applies to special products, such as aliments","Der reduzierte Steuersatz, der für spezielle Produkte - etwa Nahrungsmittel - gilt."
24
- "Shop tree root","Shop Hauptkategorie"
25
- "Marketplace tree root","Marktplatz Hauptkategorie"
26
- "Sync with MeinPaket.de","mit MeinPaket.de abgleichen"
27
- "Maximum stock qty. for MeinPaket.de","maximale Stückzahl für MeinPaket.de"
28
- "Product attributes","Produkteigenschaften"
29
- "Delivery time","Lieferzeit (in Tagen)"
30
- "Please select the product attribute which represents the approx. delivery time","Bitte wählen Sie die Produkteigenschaft, welche die Lieferzeit angibt."
31
- "Default delivery time","Standard-Lieferzeit"
32
- "Delivery time in days if no other delivery time applies","Lieferzeit in Tagen, wenn keine andere Lieferzeit angegeben."
33
- "Marketplace category ID","Marktplatz-Kategorie"
34
- "These products could not be exported","Die folgenden Produkte konnten aufgrund von Fehlern nicht exportiert werden"
35
- "Result","Ergebnis"
36
- "Selection","Auswahl"
37
- "Upload","Upload"
38
- "Common Errors","Allgemeine Fehler"
39
- "Product","Produkt"
40
- "Edit Product","Produkt bearbeiten"
41
- "Error Description","Fehlerbeschreibung"
42
- "Invalid value for field","Ungültiger Wert für Feld"
43
- "Missing value for field","Fehlender Wert für Feld"
44
- "The following products could only be exported as description","Für die folgenden Produkte konnten nur Angebote eingestellt werden"
45
- "Unknown Error","Unbekannter Fehler"
46
- "Product is unknown in MeinPaket marketplace","Produkt ist im MeinPaket Marktplatz nicht bekannt"
47
- "Successfully Exported Products","Erfolgreich exportierte Produkte"
48
- "total","gesamt"
49
- "of","von"
50
- "%s of %s products were successfully exported","%s von %s Produkten wurden erfolgreich exportiert"
51
- "At this place you can choose which products you want to export and start the process.","<b>Hier können Sie Produkte Ihres Magento-Shops nach MeinPaket.de exportieren.</b><p>Wählen Sie in der Auswahlliste unten den Punkt &bdquo;<i>Nur ausgewählte Produkte</i>&rdquo;, um nur die Produkte zu exportieren, deren &bdquo;<i>mit MeinPaket.de abgleichen</i>&rdquo;-Attribut explizit auf &bdquo;<i>Ja</i>&rdquo; gesetzt wurde. Dieses Attribut können Sie in den Produktinformationen im Reiter &bdquo;<i>Allgemein</i>&rdquo; bearbeiten.</p><p>Um alle Produkte Ihres Magento-Shops nach MeinPaket.de zu exportieren, wählen Sie &bdquo;<i>Alle</i>&rdquo; in der unten stehenden Auswahlliste. Berücksichtigt werden hierbei nur Produkte, die einer MeinPaket.de-Marktplatzkategorie zugeordnet sind.</p><p>Sie starten den Vorgang durch Betätigen des &bdquo;<i>Produkte exportieren</i>&rdquo;-Buttons. Dadurch springt der Export in den Upload-Modus. Unterbrechen Sie den Prozess während dessen nicht.</p><p>Wenn alle ausgewählten Produkte an MeinPaket übermittelt wurden, sehen Sie eine Übersicht aller exportierter Produkte sowie eine detaillierte Auflistung aller während des Vorgangs aufgetretenen Fehler.</p>"
52
- "Skipped %s duplicate orders that were already imported previously.","%s Bestellungen übersprungen, die bereits zu einem früheren Zeitpunkt importiert wurden."
53
- "Skipped %s duplicate order that was already imported previously.","%s Bestellung übersprungen, die bereits zu einem früheren Zeitpunkt importiert wurde."
54
- "%s order(s) sucessfully imported.","%s Bestellung(en) erfolgreich importiert."
55
- "start date","Startdatum"
56
- "end date","Enddatum"
57
- "Textual guide for importing orders follows here","<b>Hier können Sie Bestellungen importieren, die Käufer auf MeinPaket.de getätigt haben.</b><p>Legen Sie mit Hilfe der Felder &bdquo;<i>Startdatum</i>&rdquo; und &bdquo;<i>Enddatum</i>&rdquo; einen Zeitraum fest, für den Sie Bestellungen von MeinPaket.de importieren möchten. Sie können das Feld &bdquo;<i>Enddatum</i>&rdquo; leer lassen, um alle Bestellungen vom &bdquo;<i>Startdatum</i>&rdquo; bis zum jetzigen Zeitpunkt zu importieren.</p><p>Starten Sie den Vorgang durch Betätigen des &bdquo;<i>Bestellungen importieren</i>&rdquo;-Buttons. Warten Sie, bis der Vorgang abgeschlossen ist. Sie sehen im Anschluss einen Statusbericht über die importierten Bestellungen.</p>"
58
- "leave empty to load all till now","leer lassen, um alles bis jetzt zu laden"
59
- "please wait","Bitte warten...",
60
- "view orders","Bestellungen ansehen"
61
- "Finished","Abgeschlossen"
62
- "Import Products","Bestellungen importieren"
63
- "Import Categories","MeinPaket.de Kategorien importieren"
64
- "Category import completed.","Der Import der MeinPaket.de Marktplatz-Kategorien wurde abgeschlossen."
65
- "Textual introduction into category import goes here...","<b>Hier können Sie die Marktplatzkategorien von MeinPaket.de importieren. Die Kategorien finden Sie im Anschluss unter der Kategorie &bdquo;<i>MeinPaket.de marketplace</i>&rdquo; auf der obersten Ebene Ihres Magento-Kategoriebaumes.</b><p>Wenn Sie die MeinPaket.de-Marktplatzkategorien schon einmal importiert haben, werden diese nicht überschrieben, sondern nur mögliche Änderungen und Ergänzungen vorgenommen. Produkte, die Sie bereits MeinPaket.de-Marktplatzkategorien zugeordnet haben, bleiben weiterhin diesen Kategorien zugeordnet.</p><p>Starten Sie den Importvorgang durch Betätigen des &bdquo;<i>Kategorien importieren</i>&rdquo;-Buttons. Der Vorgang kann einige Minuten dauern. Brechen Sie den Vorgang nicht ab.</p>"
66
- "Product export failed. Failed connecting to MeinPaket server.","Produktexport fehlgeschlagen: Konnte keine Verbindung zu MeinPaket.de aufgebaut werden."
67
- "No new orders found.","Es wurden keine neuen Bestellungen gefunden."
68
- "Skipped %s order(s) because: out of stock. Please process the following order(s) at your MeinPaket.de dealer area:","%s Bestellung(en) übersprungen, da nicht auf Lager. Bitte bearbeiten Sie die folgende(n) Bestellung(en) in Ihrem MeinPaket Händlerbereich:"
69
- "Skipped %s order(s) because: some or all of the included products were disabled in Magento after the export to MeinPaket.de . Please process the following order(s) at your MeinPaket.de dealer area:","%s Bestellung(en) übersprungen, da sie Produkte enthielten, die nachträglich zum Export nach MeinPaket.de in Magento deaktiviert wurden. Bitte bearbeiten Sie die folgende(n) Bestellung(en) in Ihrem MeinPaket Händlerbereich:"
70
- "%s was ordered with a different price (%s instead of current price %s). Was the price changed after exporting to MeinPaket.de?","%s wurde zu einem anderen Preis bestellt (%s statt aktuellem Preis %s). Wurde der Preis nachträglich nach dem Export zu MeinPaket.de geändert?"
71
- "Internal error on MeinPaket server","Interner Fehler auf MeinPaket-Server",
72
- "Product stock is lower than zero.","Der Lagerbestand für dieses Produkt ist im negativen Bereich."
73
- "Overview","Übersicht"
74
- "Category","Kategorie"
75
- "Old name","Alter Name"
76
- "Edit Category","Kategorie bearbeiten"
77
- "New categories","Neue Kategorien"
78
- "Renamed categories","Umbenannte Kategorien"
79
- "Deleted categories","Gelöschte Kategorien"
80
- "Successfully imported marketplace categories.","Die Marktplatz-Kategorien wurden erfolgreich mit MeinPaket.de abgeglichen."
81
- "Connecting to MeinPaket.de server failed.","Die Verbindung zum MeinPaket.de-Server konnte nicht aufgebaut werden."
82
- "Connection to MeinPaket.de server timed out.","Der MeinPaket.de-Server antwortet nicht."
83
  "Unknown error","Es ist ein unbekannter Fehler aufgetreten"
84
- "Error","Fehler"
85
- "Added %s new categories.","Es wurden %s neue Kategorien angelegt."
86
- "Renamed %s categories.","Es wurden %s Kategorien umbenannt."
87
- "Deleted %s categories.","Es wurden %s Kategorien gelöscht, die im MeinPaket.de-Marktplatz nicht mehr verfügbar sind."
88
- "Marketplace category structure was up to date. There have been no changes.","Markplatz-Kategoriestruktur ist auf dem neuesten Stand."
89
- "Imported from DHL MeinPaket.de","Importiert von MeinPaket.de"
90
- "MeinPaket.de Order No.","MeinPaket.de Best.Nr."
91
- "Request could not be built.","Die Anfrage konnte nicht generiert werden."
92
- "MeinPaket.de server returned HTPP code %s.","Der MeinPaket.de-Server hat den HTTP-Fehlercode %s zurückgeliefert."
93
- "Connection to MeinPaket.de server timed out.","Zeitüberschreitung beim Verbindungsaufbau zu MeinPaket.de-Server."
94
- "Invalid response from MeinPaket.de server.","Ungültige Antwort von MeinPaket.de-Server erhalten."
95
- "Error on tranfering cancelled items to MeinPaket.de.","Bei der Stornierung der Bestellpositionen bei MeinPaket.de ist ein Fehler aufgetreten."
96
- "MeinPaket.de server returned error code %s.","Der MeinPaket.de-Server hat den Fehlercode %s zurückgegeben."
97
- "Shipment has not been accepted by MeinPaket.de.","Die Lieferung wurde von MeinPaket.de nicht akzeptiert."
98
- "Error on transfering shipment to MeinPaket.de.","Fehler beim Senden der Lieferinformationen zu MeinPaket.de."
99
- "Refund has not been accepted by MeinPaket.de.","Die Gutschrift wurde nicht von MeinPaket.de akzeptiert."
100
- "Error on transfering refund to MeinPaket.de.","Fehler beim Senden der Gutschrift an MeinPaket.de."
101
- "Tracking code has not been accepted by MeinPaket.de.","Der gesendete Tracking-Code für diese Lieferung wurde von MeinPaket.de nicht akzeptiert."
102
- "MeinPaket.de returned error code %s.","MeinPaket.de lieferte den Fehler-Code %s zurück."
103
- "Error on transfering tracking code to MeinPaket.de.","Fehler beim Senden des Tracking-Codes am MeinPaket.de."
104
- "There were no products that could be exported.","Es konnten keine Produkte exportiert werden."
105
- "Product information has not been accepted by MeinPaket.de.","Die Produktinformationen wurden von MeinPaket.de nicht akzeptiert."
106
- "Error on transfering product information to MeinPaket.de.","Fehler beim Exportieren des Produktes nach MeinPaket.de."
107
- "Thank you for your order!","Vielen Dank für Ihre Bestellung!"
108
- "Your order was successfully processed at MeinPaket.de. We will recieve your order shortly.","Ihre Bestellung wurde bei MeinPaket.de erfogreich bearbeitet. Wir werden Ihre Bestellung in Kürze erhalten."
109
- "Ooops!","Uuups!"
110
- "Something has gone terribly wrong while processing your order at MeinPaket.de! Please contact our customer service.","Etwas ist schiefgelaufen, während Ihre Bestellung bei MeinPaket.de bearbeitet wurde. Bitte kontaktieren Sie unseren Kundenservice!"
111
- "Checkout aborted!","Bestellvorgang abgebrochen!"
112
- "You decided to abort the external checkout at DHL MeinPaket. Your order has NOT been processed yet. Feel free to continue shopping and use our own checkout.","Sie haben den POSTPAY abgebrochen. Ihre Bestellung wurde noch NICHT verabeitet. Gerne können Sie Ihren Einkauf fortsetzen und unseren Checkout nutzen."
113
- "Continue shopping","Einkauf fortsetzen"
114
- "Checkout","Checkout"
115
- "POSTPAY available","POSTPAY anbieten"
116
- "This defines wether the external Checkout with DHL is available for customers.","Dies legt fest, ob der POSTPAY für Ihre Kunden verfügbar ist."
117
- "The MeinPaket server did not deliver a valid response. Have a look at the system log for more information.","Der MeinPaket-Server hat keine gültige Antwort für die Bestellungsabfrage geliefert. Für mehr Informationen zu diesem Problem, schauen Sie bitte im System-Log nach."
118
- "You are not authorized to execute the requested functionality on MeinPaket","Sie sind nicht berechtigt diese Funktionalität der MeinPaket-Plattform zu nutzen"
119
- "The provided data was incorrect","MeinPaket konnte die gegebenen Daten nicht akzeptieren"
120
- "The requested modification is not allowed. Please contact the MeinPaket support team","Diese Modifikation ist nicht erlaubt. Bitte kontaktieren Sie das MeinPaket Support Team"
121
- "The product is not mapped to neither a marketplace nor a shop category","Dieses Produkt ist weder einer Markplatzkategorie noch einer Shopkategorie zugewiesen"
122
- "The referenced product cannot be sold","Das Produkt kann nicht auf MeinPaket verkauft werden"
123
- "The referenced marketplace category could not be found at MeinPaket","Die angegebene Marktplatzkategorie kann auf MeinPaket nicht gefunden werden. Bitte importieren Sie die Marktplatzkategorien erneut, um auf dem aktuellen Stand zu arbeiten"
124
- "The referenced shop category could not be found at MeinPaket","Die angegebene Shop-Kategorie konnte bei MeinPaket nicht gefunden werden"
125
- "Default Shipment Method","Standard Versandmethode"
126
- "Shipment method which is used for order import and POSTPAY.","Versandmethode, die beim Import von MeinPaket-Bestellungen und für POSTPAY verwendet wird."
127
- "Submit shipping costs for POSTPAY","Versandkosten übertragen"
128
- "If set to yes, the shippingscosts for the POSTPAY will be calculated based on the default shipment method.","Legt fest, ob die Versandkosten basierend auf der eingestellten Standard Liefermethode mit übertragen werden."
129
- "Error on POSTPAY","Fehler bei POSTPAY"
130
- "The current version of POSTPAY does not support configurable products.","POSTPAY unterstützt in der aktuellen Version keine konfigurierbaren Produkte."
131
- "attribute mapping","Attribut-Mapping"
132
- "Attribute Mapping","Attribut-Mapping"
133
- "Attribute mappings","Attribut-Mappings"
134
- "Attribute Mappings","Attribut-Mappings"
135
- "Add Attribute Mapping","Neues Attribut-Mapping"
136
- "Save Mapping","Mapping speichern"
137
- "Create Attribute Mapping","Neues Attribut-Mapping anlegen"
138
- "Edit Attribute Mapping","Attribut-Mapping bearbeiten"
139
- "Magento Attribute Set","Magento Attribut-Set"
140
- "Please select attribute set and variant.","Bitte wählen Sie ein Attribut-Set und eine Varianten-Konfiguration aus."
141
- "MeinPaket Variant Configuration","MeinPaket Varianten-Konfiguration"
142
- "_Custom_","_Benutzerdefiniert_"
143
- "not assigned","nicht zugewiesen"
144
- "Magento Attribute","Magento-Attribut"
145
- "MeinPaket Attribute","MeinPaket-Attribut"
146
- "Magento Value","Magento-Wert"
147
- "MeinPaket Value","MeinPaket-Wert"
148
- "Edit Value Mapping","bearbeiten"
149
- "Delete Mapping","löschen"
150
- "No mapable attribute values available for the selected MeinPaket attribute.","Für das ausgewählte MeinPaket-Attribut existieren keine zuweisbaren Attribut-Werte."
151
- "Magento attribute values will be used instead.","Es werden direkt die Werte des Magento-Attributes verwendet."
152
- "_Auto_","_Automatisch_"
153
- "Apply a mapping for the following MeinPaket attributes","Bitte legen Sie für folgenden MeinPaket-Attribute ein Attribut-Mapping fest"
154
- "A mapping for the Magento attribute set already exists.","Ein Mapping für das ausgewählte Attribut-Set existiert bereits."
155
- "Your shopping cart contains product types that can not be handled by POSTPAY.","Ihr Einkaufswagen enthält Produkttypen, die von POSTPAY nich verarbeitet werden können."
156
- "Not available.","Nicht verfügbar."
157
- "Product export failed for unknown reason.","Der Produktexport ist aus einem unbekannten Grund fehlgeschlagen."
158
- "Missing value mapping for attribute","Fehlende Wertezuweisung für Attribut"
159
- "Default customer email","Standard Kunden-E-Mail-Adresse"
160
- "Customer","Kunde"
161
- "This eMail address is used as the default one for orders that do not include one.","Diese E-Mail-Adresse wird als Standard-Adresse für Bestellungen verwendet, für die keine Kunden-E-Mail-Adresse geliefert wird."
162
- "The following configurable products could not be exported","Die folgenden konfigurierbaren Produkte konnten nicht exportiert werden"
163
- "Ivalid modification of element","Unerlaubte Modifikation des Elementes"
164
- "Variant group does not exist on MeinPaket","Die verwendeten Produktattribute sind als MeinPaket-Variantenkonfiguration nicht bekannt."
165
- "Color","Farbe"
166
- "Size","Größe"
167
- "Dimension","Abmessung"
168
- "Quantity","Anzahl"
169
- "Width","Breite"
170
- "Format","Format"
171
- "Material","Material"
172
- "Length","Länge"
173
- "Flavor","Geschmacksrichtung"
174
- "Inscription","Beschriftung"
175
- "Model","Modell"
176
- "Platform","Plattform"
177
- "Radius","Radius"
178
- "Strength","Stärke"
179
- "Diameter","Durchmesser"
180
- "Cylinder","Zylinder"
181
- "Axis","Achse"
182
- "Bust Measurement",Brustumfang
183
- "Cup","Cup"
184
  "You will be redirected to the Postpay website when you place an order.","Sie werden auf die Postpay Webseite weiter geleitet, wenn sie die Bestellung aufgeben."
 
 
 
 
 
 
 
 
 
1
  "all","Alle"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2
  "Unknown error","Es ist ein unbekannter Fehler aufgetreten"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3
  "You will be redirected to the Postpay website when you place an order.","Sie werden auf die Postpay Webseite weiter geleitet, wenn sie die Bestellung aufgeben."
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>DHL_MeinPaket2</name>
4
- <version>2.0.16</version>
5
  <stability>stable</stability>
6
  <license>--</license>
7
  <channel>community</channel>
8
  <extends/>
9
- <summary>MeinPaket connector</summary>
10
- <description>The Extension connects your magento shop with DHL MeinPaket.</description>
11
  <notes>--</notes>
12
- <authors><author><name>DHL Vertriebs GmbH</name><user>--</user><email>support@meinpaket.de</email></author></authors>
13
- <date>2015-02-23</date>
14
- <time>13:06:54</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="6f27e6fb28ee96e9202361e7d6c43768"/></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"/></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="f195ae885607cae202a100aef8091c09"/><file name="Order.php" hash="82c24fb8790c629c200ce18645ea5a25"/><file name="Product.php" hash="8471fd7dc30ae6e749abf8dd9be69a8a"/><file name="Shipment.php" hash="420dfdb45b0f6f8f97ca4e18dd1d1078"/></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="624ea118bc73c7dd3cae69d3828d9083"/><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="3caf8e3ae7e5cf3ac8e734cc6fa60919"/></dir><file name="Category.php" hash="3f1ee3b59040b5947a4fb8878d02dbf6"/></dir><file name="Observer.php" hash="c0d04ae77ecfa2f6fb3731918f252b5f"/><dir name="Payment"><dir name="Method"><file name="Meinpaket.php" hash="3f89a67bbda6b63d8d25be1fd9845110"/></dir></dir><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="f82c4f1fd2d359cd60976ff4242a7255"/></dir></dir></dir><dir name="Service"><dir name="MarketplaceCategoryImport"><file name="ImportService.php" hash="bf0c889ce83b0afe084c20f97288370e"/><file name="Result.php" hash="a8a2d4d726651237fb41c3595b223c22"/></dir><dir name="Product"><dir name="Export"><dir name="Exception"><file name="InvalidEan.php" hash="bc88e3bc48a8a96e45079054290ae68c"/></dir></dir><file name="Export.php" hash="8ddbc7b823c7e57143c2ab7fce51d4f6"/></dir><dir name="ProductData"><file name="RequestService.php" hash="99b61b8f9dbd30a64b070ab51437fc91"/></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="ce946545c10b691876bb8331132f6eaa"/><file name="MatchingController.php" hash="f568a8a7d331264944d1586aa567e6ee"/><file name="ProductExportController.php" hash="68a327e432eafa49d0a50cd46fad9029"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="494b2a3a53756cb50b654da8fc86c8a7"/><file name="config.xml" hash="184d84c626283791d3809aebdbfd1e6a"/><file name="system.xml" hash="f91163365f268dd0f21feccb581962ce"/></dir><dir name="sql"><dir name="meinpaket_setup"><file name="mysql4-install-1.0.0.php" hash="2a2e411ddfdc1a0867d6beb627d6ee8c"/><file name="mysql4-upgrade-1.0.0-1.1.0.php" hash="bdb2ac11cd070e409c97aa3978c42f7e"/><file name="mysql4-upgrade-1.1.0-2.0.0.php" hash="53ede6255c31a300743174ac0192d2bc"/></dir></dir></dir></dir><dir name="Postpay"><dir><dir name="Block"><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="171458225daa6c432defcfed1cffaac9"/><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="ec7e8db01d7d7c81f35797e1009f72db"/><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="e75165ec2772e0174d8bdb62adcdd50b"/></dir></dir></dir><dir name="Service"><dir name="Order"><file name="ImportService.php" hash="32023a8ef0852221da0c11a7b533eaad"/></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="c6b7383a16c7c22c5693a8035b6b677e"/><file name="system.xml" hash="43de1564100406a0cfcf69096f89b41a"/></dir><dir name="sql"><dir name="postpay_setup"><file name="mysql4-install-1.0.0.php" hash="036e483e03bf55a4f40bfca3d8e71eb4"/></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"/></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="8edcee18eaca83942f5d30bfb65f7ff9"/><file name="Order.php" hash="4f931b155ba3069a76b1dc8ef26c3e15"/><file name="Product.php" hash="704fa60b29af41a61c2422b23fa28b26"/><file name="Shipment.php" hash="13d9db3d96059e4d63cf8ad367a6a0a7"/></dir><dir name="Model"><file name="Async.php" hash="3112120abd4ff2773dbcf19dedfd4044"/><dir name="Carrier"><file name="Meinpaket.php" hash="104937bd9c3961ef5b0d7939141d7865"/></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="4780d0dcd467410643d1156fc5787608"/></dir><file name="Cron.php" hash="aa707519b312693b5021036ec6dcaee3"/><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="ebf0911ae42d31fcb09941068a6a6b23"/><dir name="Payment"><dir name="Method"><file name="Meinpaket.php" hash="fdbc24e8330ecbb71243e1f4b5b83bc3"/></dir></dir><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="7efbaf9ad4ffc63468c99e90a1d337ad"/></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="ffec58bd614f33a911a3288c9ca81ba5"/></dir><file name="CancellationService.php" hash="a6806a3531b596a729a418688ba51dcc"/><file name="ImportService.php" hash="9ede62d801351696ed6487bd7a8392b1"/><dir name="RefundExportService"><file name="Result.php" hash="79389a6ef79a900d1a1d94ec071847bc"/></dir><file name="RefundExportService.php" hash="96f68022c2b21572e4fb7c6f8373247b"/><dir name="ShipmentExportService"><file name="Result.php" hash="887f1ec6991790b995388c43a8e99a60"/></dir><file name="ShipmentExportService.php" hash="325fcab2d42a9bfe5969a984504dbb7f"/></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="1b191b6c7e771043ce76f140f8a638b6"/><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="93f15776fbc75435c417d7fc1963e4c4"/></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="057c1f82c20cf7997c3841560db7cbc6"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="a406f2625c59af13362056b1df70e0d8"/><file name="config.xml" hash="cd9f1275a39467ca94e1c7e12020cfcf"/><file name="system.xml" hash="1e416e9423348045c7d4f19386c8a131"/></dir><dir name="sql"><dir name="meinpaketcommon_setup"><file name="mysql4-install-1.0.0.php" hash="be354c17f96ffeecb74837974099f8c7"/></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="2993d81e175d8e3ebdfe8fd7297f2ef6"/><file name="dhlmeinpaket-product-export.php" hash="8effb502150d794d67f508d926993a17"/><file name="dhlmeinpaket-request-bestprice.php" hash="cd546b61204de3f62206f2aec03f3c91"/><file name="dhlmeinpaket-order-import.php" hash="179e57d2fa37e0a3407bcbe222fe711e"/></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="6db7b74dd7ab8f3108510a5ef58aabf3"/><file name="index.phtml" hash="dc021b9e1cb91f4ac499f218566f978a"/></dir></dir></dir><file name="leftmenu.phtml" hash="4afb8d200ed8ceddf2f682c5911c565c"/><file name="steps.phtml" hash="8fcd5c06f70a00c18e325cf9b94693e6"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir><dir name="de_DE"><file name="Dhl_MeinPaket.csv" hash="1014e60bac8dc0e692d695733c17fa7f"/><file name="Dhl_Postpay.csv" hash="cb5daef3a6a95824c81dfc42db6124f1"/><file name="Dhl_MeinPaketCommon.csv" hash="9d562e495b66d92a1a6f3600a72b23e5"/></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="dhl_logo_kl.gif" hash="43fdd8c3b923355fdd27070feca49dc7"/><file name="loader.gif" hash="823d2e0f3345c88e9463a38a9c360817"/><file name="meinpaket_logo.png" hash="e5fc2c6d23da15893e81ae53704e49c9"/><file name="shadowtopbg.png" hash="9e274a269dcbe50256d1be49a192a9cd"/></dir><file name="module.css" hash="c0ad44ad9719ae396f9becbd183f5033"/><file name="module.js" hash="0ace146549dd0befdd83d23a3149f140"/></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_MeinPaket2</name>
4
+ <version>2.4.0</version>
5
  <stability>stable</stability>
6
  <license>--</license>
7
  <channel>community</channel>
8
  <extends/>
9
+ <summary>Allyouneed connector</summary>
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>
shell/dhlmeinpaket-category-import.php CHANGED
@@ -2,7 +2,7 @@
2
  require_once 'abstract.php';
3
 
4
  /**
5
- * Imports the category structure from MeinPaket.
6
  *
7
  * @category Dhl
8
  * @package Dhl_MeinPaket
@@ -11,7 +11,7 @@ require_once 'abstract.php';
11
  */
12
  class Dhl_MeinPaket_Shell_CategoryImport extends Mage_Shell_Abstract {
13
  /**
14
- * Imports the marketplace category structure from DHL MeinPaket.
15
  *
16
  * @return Dhl_MeinPaket_Shell_CategoryImport
17
  */
2
  require_once 'abstract.php';
3
 
4
  /**
5
+ * Imports the category structure from Allyouneed.
6
  *
7
  * @category Dhl
8
  * @package Dhl_MeinPaket
11
  */
12
  class Dhl_MeinPaket_Shell_CategoryImport extends Mage_Shell_Abstract {
13
  /**
14
+ * Imports the marketplace category structure from DHL Allyouneed.
15
  *
16
  * @return Dhl_MeinPaket_Shell_CategoryImport
17
  */
shell/dhlmeinpaket-order-import.php CHANGED
@@ -2,7 +2,7 @@
2
  require_once 'abstract.php';
3
 
4
  /**
5
- * Imports the category structure from MeinPaket.
6
  *
7
  * @category Dhl
8
  * @package Dhl_MeinPaket
@@ -17,7 +17,7 @@ class Dhl_MeinPaketCommon_Shell_OrderImport extends Mage_Shell_Abstract {
17
  const DEFAULT_HOURS = 24;
18
 
19
  /**
20
- * Imports orders from DHL MeinPaket.
21
  *
22
  * @return Dhl_MeinPaket_Shell_OrderImport
23
  */
2
  require_once 'abstract.php';
3
 
4
  /**
5
+ * Imports the category structure from Allyouneed.
6
  *
7
  * @category Dhl
8
  * @package Dhl_MeinPaket
17
  const DEFAULT_HOURS = 24;
18
 
19
  /**
20
+ * Imports orders from DHL Allyouneed.
21
  *
22
  * @return Dhl_MeinPaket_Shell_OrderImport
23
  */
shell/dhlmeinpaket-product-export.php CHANGED
@@ -2,7 +2,7 @@
2
  require_once 'abstract.php';
3
 
4
  /**
5
- * Exports products to MeinPaket.
6
  *
7
  * @category Dhl
8
  * @package Dhl_MeinPaket
@@ -11,7 +11,7 @@ require_once 'abstract.php';
11
  */
12
  class Dhl_MeinPaket_Shell_ProductExport extends Mage_Shell_Abstract {
13
  /**
14
- * Exports products DHL MeinPaket.
15
  *
16
  * @return Dhl_MeinPaket_Shell_ProductExport
17
  */
2
  require_once 'abstract.php';
3
 
4
  /**
5
+ * Exports products to Allyouneed.
6
  *
7
  * @category Dhl
8
  * @package Dhl_MeinPaket
11
  */
12
  class Dhl_MeinPaket_Shell_ProductExport extends Mage_Shell_Abstract {
13
  /**
14
+ * Exports products DHL Allyouneed.
15
  *
16
  * @return Dhl_MeinPaket_Shell_ProductExport
17
  */
shell/dhlmeinpaket-request-bestprice.php CHANGED
@@ -2,7 +2,7 @@
2
  require_once 'abstract.php';
3
 
4
  /**
5
- * Imports the variant configurations from MeinPaket.
6
  *
7
  * @category Dhl
8
  * @package Dhl_MeinPaket
@@ -11,7 +11,7 @@ require_once 'abstract.php';
11
  */
12
  class Dhl_MeinPaket_Shell_RequestBestPrice extends Mage_Shell_Abstract {
13
  /**
14
- * Imports the variant configurations from DHL MeinPaket.
15
  *
16
  * @return Dhl_MeinPaket_Shell_VariantConfigurationsDownload
17
  */
2
  require_once 'abstract.php';
3
 
4
  /**
5
+ * Imports the variant configurations from Allyouneed.
6
  *
7
  * @category Dhl
8
  * @package Dhl_MeinPaket
11
  */
12
  class Dhl_MeinPaket_Shell_RequestBestPrice extends Mage_Shell_Abstract {
13
  /**
14
+ * Imports the variant configurations from DHL Allyouneed.
15
  *
16
  * @return Dhl_MeinPaket_Shell_VariantConfigurationsDownload
17
  */
skin/adminhtml/default/default/meinpaketcommon/images/ayn_ger_tuete_produkte_aussen.jpg ADDED
Binary file
skin/adminhtml/default/default/meinpaketcommon/images/meinpaket_logo.png DELETED
Binary file
skin/adminhtml/default/default/meinpaketcommon/module.css CHANGED
@@ -1,49 +1,55 @@
1
  @CHARSET "UTF-8";
2
 
3
- h3.meinpaket {}
4
- div#meinpaket-description {background: url('images/meinpaket_logo.png') no-repeat 0px 5px; padding: 5px 150px 20px 240px; min-height: 100px; }
5
- div#meinpaket-description p {text-align: justify;}
6
- div#meinpaket-description b {color: #515151;}
7
- div#meinpaket-description i {color: #646B70;}
8
- div.meinpaket-content {padding: 10px; background: url('images/shadowtopbg.png') repeat-x #E5E5E5; border: 1px solid #FFCC00}
9
 
10
- div.meinpaket-content form label {margin-right: 10px; }
11
 
12
  #disabled-till-export {}
13
 
14
- ul.meinpaket-steps {margin: 10px 0 0 0; clear: both}
 
 
 
 
 
 
15
  li.nr1 {background: url('images/1.png') no-repeat 0px 0px }
16
  li.nr2 {background: url('images/2.png') no-repeat 0px 0px }
17
  li.nr3 {background: url('images/3.png') no-repeat 0px 0px }
18
- ul.meinpaket-steps li { background-color: #6A6B6B; width: 32%; display: block; border: 1px solid #595959; float: left; padding: 8px 0px 8px 0px; margin: 5px 1% 15px 0;}
19
- ul.meinpaket-steps li p {margin: 4px 0 4px 80px; font-weight: bold}
20
- ul.meinpaket-steps li.active { background-color: #FFCC00; border-style: solid; border-color: #ddbb00;}
21
 
22
  div.scrollablebox {height: 300px; overflow: auto; /*border: 1px solid #eee; padding: 5px;*/}
23
 
24
- table#meinpaket-results {}
25
  th.col-product {min-width: 200px}
26
- table#meinpaket-results td.row-subheader { background-color: #FFCC00; color: #2F2F2F; font-weight: bold; }
27
- table#meinpaket-results td.row-subheader span.resultCount { color: #646B70; font-size: 80%; }
28
- table#meinpaket-results td.row-num { width: 1px; text-align: right !important; }
29
- table#meinpaket-results th.header-center { text-align: center !important; }
30
  .cc {clear: both}
31
 
32
- .meinpaket-waitbox { float: none; display: block; clear: both; padding: 10px; text-align: center; }
33
- .meinpaket-waitbox small { position: relative; top: -8px; }
34
 
35
  .columns #edit_form .form-list td.value { width: auto; }
36
  #edit_form .form-list td.value select { width: 280px; }
37
 
38
- .section-config.meinpaket > :first-child {
39
  background-color: #fc0 !important;
40
  }
41
 
42
- .section-config.meinpaket > :first-child > a {
43
- color: #ff0000 !important;
44
  }
45
 
46
- .section-config.meinpaket:first-child {
47
  padding-top: 170px;
48
- background:url('http://portal.meinpaket.de/fileadmin/media/magento_admin.jpg') no-repeat;
49
  }
1
  @CHARSET "UTF-8";
2
 
3
+ h3.allyouneed {}
4
+ div#allyouneed-description { background: url('images/ayn_ger_tuete_produkte_aussen.jpg') no-repeat 20px 5px; padding: 5px 150px 20px 240px; min-height: 150px; position:relative; }
5
+ div#allyouneed-description p {text-align: justify;}
6
+ div#allyouneed-description b {color: #515151;}
7
+ div#allyouneed-description i {color: #646B70;}
8
+ div.allyouneed-content {padding: 10px; background: url('images/shadowtopbg.png') repeat-x #E5E5E5; border: 1px solid #FFCC00}
9
 
10
+ div.allyouneed-content form label {margin-right: 10px; }
11
 
12
  #disabled-till-export {}
13
 
14
+ #allyouneed_form {
15
+ position: absolute;
16
+ right: 30px;
17
+ bottom: 10px;
18
+ }
19
+
20
+ ul.allyouneed-steps {margin: 10px 0 0 20px; clear: both}
21
  li.nr1 {background: url('images/1.png') no-repeat 0px 0px }
22
  li.nr2 {background: url('images/2.png') no-repeat 0px 0px }
23
  li.nr3 {background: url('images/3.png') no-repeat 0px 0px }
24
+ ul.allyouneed-steps li { background-color: #6A6B6B; width: 32%; display: block; border: 1px solid #595959; float: left; padding: 8px 0px 8px 0px; margin: 5px 1% 15px 0;}
25
+ ul.allyouneed-steps li p {margin: 4px 0 4px 80px; font-weight: bold}
26
+ ul.allyouneed-steps li.active { background-color: #FFCC00; border-style: solid; border-color: #ddbb00;}
27
 
28
  div.scrollablebox {height: 300px; overflow: auto; /*border: 1px solid #eee; padding: 5px;*/}
29
 
30
+ #allyouneed-results {padding-left:20px;}
31
  th.col-product {min-width: 200px}
32
+ table#allyouneed-results td.row-subheader { background-color: #FFCC00; color: #2F2F2F; font-weight: bold; }
33
+ table#allyouneed-results td.row-subheader span.resultCount { color: #646B70; font-size: 80%; }
34
+ table#allyouneed-results td.row-num { width: 1px; text-align: right !important; }
35
+ table#allyouneed-results th.header-center { text-align: center !important; }
36
  .cc {clear: both}
37
 
38
+ .allyouneed-waitbox { float: none; display: block; clear: both; padding: 10px; text-align: center; }
39
+ .allyouneed-waitbox small { position: relative; top: -8px; }
40
 
41
  .columns #edit_form .form-list td.value { width: auto; }
42
  #edit_form .form-list td.value select { width: 280px; }
43
 
44
+ .section-config.allyouneed > :first-child {
45
  background-color: #fc0 !important;
46
  }
47
 
48
+ .section-config.allyouneed > :first-child > a {
49
+ color: #D40511 !important;
50
  }
51
 
52
+ .section-config.allyouneed:first-child {
53
  padding-top: 170px;
54
+ background:url('http://portal.allyouneed.com/fileadmin/media/magento_admin.jpg') no-repeat;
55
  }
skin/adminhtml/default/default/meinpaketcommon/module.js CHANGED
@@ -1,6 +1,6 @@
1
  function startProcessing() {
2
- var form = $('meinpaket_form');
3
- $('startButton').hide();
4
  $('disabled-till-export').show();
5
 
6
  $$('li.nr1').each(function(aElement) {
@@ -11,11 +11,10 @@ function startProcessing() {
11
  aElement.addClassName('active');
12
  });
13
 
14
- $('meinpaket-description').hide();
15
  form.submit();
16
  form.disable();
17
- form.hide();
18
-
19
  }
20
 
21
  function setLocationWithWait(gotourl) {
@@ -24,7 +23,7 @@ function setLocationWithWait(gotourl) {
24
  }
25
 
26
  function submitForm(actionUrl) {
27
- var form = $('meinpaket_form');
28
  form.writeAttribute('action', actionUrl);
29
  form.submit();
30
 
1
  function startProcessing() {
2
+ var form = $('allyouneed_form');
3
+ //$('startButton').hide();
4
  $('disabled-till-export').show();
5
 
6
  $$('li.nr1').each(function(aElement) {
11
  aElement.addClassName('active');
12
  });
13
 
14
+ $('allyouneed-description').hide();
15
  form.submit();
16
  form.disable();
17
+ //form.hide();
 
18
  }
19
 
20
  function setLocationWithWait(gotourl) {
23
  }
24
 
25
  function submitForm(actionUrl) {
26
+ var form = $('allyouneed_form');
27
  form.writeAttribute('action', actionUrl);
28
  form.submit();
29
 
skin/frontend/default/default/meinpaket/images/dhl_checkout_button.png DELETED
Binary file