dpdshipping - Version 1.0.7

Version Notes

Added translate Files and Emails

Release Info

Developer	PHPro
Extension	dpdshipping
Version	1.0.7
Comparing to
See all releases

Code changes from version 1.0.6 to 1.0.7

Files changed (20) hide show

app/code/community/DPD/Shipping/Helper/Data.php +44 -10
app/code/community/DPD/Shipping/Model/Adminhtml/Dpdgrid.php +24 -9
app/code/community/DPD/Shipping/Model/Observer.php +42 -0
app/code/community/DPD/Shipping/Model/Returnlabels.php +54 -38
app/code/community/DPD/Shipping/Model/Webservice.php +11 -5
app/code/community/DPD/Shipping/controllers/AjaxController.php +1 -0
app/code/community/DPD/Shipping/etc/config.xml +18 -1
app/design/frontend/base/default/layout/dpd_shipping.xml +6 -0
app/design/frontend/base/default/template/dpd/parcelshop.phtml +14 -0
app/design/frontend/base/default/template/dpd/parcelshoplink.phtml +5 -1
app/design/frontend/base/default/template/dpd/parcelshopselected.phtml +4 -0
app/etc/modules/DPD_Shipping.xml +0 -9
app/locale/de_DE/DPD_Shipping.csv +2 -1
app/locale/en_US/DPD_Shipping.csv +2 -1
app/locale/fr_FR/DPD_Shipping.csv +0 -83
app/locale/nl_NL/DPD_Shipping.csv +1 -0
js/dpd/onestepcheckout_shipping.js +68 -0
js/dpd/shipping.js +0 -1
package.xml +5 -5
skin/frontend/base/default/css/dpd/shipping.css +8 -1

app/code/community/DPD/Shipping/Helper/Data.php CHANGED Viewed

	@@ -7,6 +7,7 @@
7	* @category Checkout
8	* @author PHPro (info@phpro.be)
9	*/

10	/**
11	* Class DPD_Shipping_Helper_Data
12	*/
	@@ -105,10 +106,11 @@ class DPD_Shipping_Helper_Data extends Mage_Core_Helper_Abstract
105	* @param $message
106	* @param $level
107	*/
108	- public function log($message,$level){

109	$allowedLogLevel = Mage::getStoreConfig('carriers/dpdparcelshops/log_level');
110	- if($level <= $allowedLogLevel){
111	- Mage::log($message,$level,'dpd.log');
112	}
113	}
114
	@@ -119,11 +121,12 @@ class DPD_Shipping_Helper_Data extends Mage_Core_Helper_Abstract
119	* @param $folder
120	* @param $name
121	*/
122	- public function generatePdfAndSave($pdfString, $folder, $name){

123	$io = new Varien_Io_File();
124	$io->setAllowCreateFolders(true);
125	- $io->open(array('path' => Mage::getBaseDir('media')."/dpd/".$folder));
126	- $io->streamOpen($name.'.pdf', 'w+');
127	$io->streamLock(true);
128	$io->streamWrite($pdfString);
129	$io->streamUnlock();
	@@ -135,7 +138,8 @@ class DPD_Shipping_Helper_Data extends Mage_Core_Helper_Abstract
135	*
136	* @return bool
137	*/
138	- public function isMageEnterprise() {

139	return Mage::getConfig()->getModuleConfig('Enterprise_Enterprise') && Mage::getConfig()->getModuleConfig('Enterprise_AdminGws') && Mage::getConfig()->getModuleConfig('Enterprise_Checkout') && Mage::getConfig()->getModuleConfig('Enterprise_Customer');
140	}
141
	@@ -148,7 +152,7 @@ class DPD_Shipping_Helper_Data extends Mage_Core_Helper_Abstract
148	public function getLanguageFromStore($storeId)
149	{
150	$locale = Mage::app()->getStore($storeId)->getConfig('general/locale/code');
151	- $localeCode = explode('_' , $locale);
152
153	return strtoupper($localeCode[0]);
154	}
	@@ -159,13 +163,43 @@ class DPD_Shipping_Helper_Data extends Mage_Core_Helper_Abstract
159	* @param $shipment
160	* @return int
161	*/
162	- public function calculateTotalShippingWeight($shipment){

163	$weight = 0;
164	$shipmentItems = $shipment->getAllItems();
165	foreach ($shipmentItems as $shipmentItem) {
166	- $~~weight~~ = $~~weight + $~~shipmentItem->~~getWeight~~();



167	}
168
169	return $weight;
170	}


























171	}


7	* @category Checkout
8	* @author PHPro (info@phpro.be)
9	*/
10	+
11	/**
12	* Class DPD_Shipping_Helper_Data
13	*/

106	* @param $message
107	* @param $level
108	*/
109	+ public function log($message, $level)
110	+ {
111	$allowedLogLevel = Mage::getStoreConfig('carriers/dpdparcelshops/log_level');
112	+ if ($level <= $allowedLogLevel) {
113	+ Mage::log($message, $level, 'dpd.log');
114	}
115	}
116

121	* @param $folder
122	* @param $name
123	*/
124	+ public function generatePdfAndSave($pdfString, $folder, $name)
125	+ {
126	$io = new Varien_Io_File();
127	$io->setAllowCreateFolders(true);
128	+ $io->open(array('path' => Mage::getBaseDir('media') . "/dpd/" . $folder));
129	+ $io->streamOpen($name . '.pdf', 'w+');
130	$io->streamLock(true);
131	$io->streamWrite($pdfString);
132	$io->streamUnlock();

138	*
139	* @return bool
140	*/
141	+ public function isMageEnterprise()
142	+ {
143	return Mage::getConfig()->getModuleConfig('Enterprise_Enterprise') && Mage::getConfig()->getModuleConfig('Enterprise_AdminGws') && Mage::getConfig()->getModuleConfig('Enterprise_Checkout') && Mage::getConfig()->getModuleConfig('Enterprise_Customer');
144	}
145

152	public function getLanguageFromStore($storeId)
153	{
154	$locale = Mage::app()->getStore($storeId)->getConfig('general/locale/code');
155	+ $localeCode = explode('_', $locale);
156
157	return strtoupper($localeCode[0]);
158	}

163	* @param $shipment
164	* @return int
165	*/
166	+ public function calculateTotalShippingWeight($shipment)
167	+ {
168	$weight = 0;
169	$shipmentItems = $shipment->getAllItems();
170	foreach ($shipmentItems as $shipmentItem) {
171	+ $orderItem = $shipmentItem->getOrderItem();
172	+ if(!$orderItem->getParentItemId()){
173	+ $weight = $weight + ($shipmentItem->getWeight() * $shipmentItem->getQty());
174	+ }
175	}
176
177	return $weight;
178	}
179	+
180	+ /**
181	+ * Check if on Onestepcheckout page or if Onestepcheckout is the refferer
182	+ *
183	+ * @return bool
184	+ */
185	+ public function getIsOnestepCheckout()
186	+ {
187	+ if (strpos(Mage::helper("core/url")->getCurrentUrl(), 'onestepcheckout') !== false \|\| strpos(Mage::app()->getRequest()->getHeader('referer'), 'onestepcheckout') !== false) {
188	+ return true;
189	+ }
190	+ return false;
191	+ }
192	+
193	+ /**
194	+ * Return our custom js when the check for onestepcheckout returns true.
195	+ *
196	+ * @return string
197	+ */
198	+ public function getOnestepCheckoutJs()
199	+ {
200	+ if ($this->getIsOnestepCheckout()) {
201	+ return 'dpd/onestepcheckout_shipping.js';
202	+ }
203	+ return '';
204	+ }
205	}

app/code/community/DPD/Shipping/Model/Adminhtml/Dpdgrid.php CHANGED Viewed

@@ -7,6 +7,7 @@
              * @category     Checkout
              * @author       PHPro (info@phpro.be)
              */
             /**
              * Class DPD_Shipping_Model_Adminhtml_DpdGrid
              */
@@ -111,21 +112,35 @@ class DPD_Shipping_Model_Adminhtml_Dpdgrid extends Mage_Core_Model_Abstract
+                {
                     $parcelshop = false;
                     $billingAddress = $order->getBillingAddress();
-            -
                    $recipient = array(
-            -
                        'name1' => $billingAddress->getFirstname() . " " . $billingAddress->getLastname(),
-            -
                        'street' => $billingAddress->getStreet(1) . " " . $billingAddress->getStreet(2),
-            -
                        'country' => $billingAddress->getCountry(),
-            -
                        'zipCode' => $billingAddress->getPostcode(),
-            -
                        'city' => $billingAddress->getCity()
-            -
                    );
                     if (strpos($order->getShippingMethod(), 'parcelshop') !== false) {
                         $parcelshop = true;
+                    }
                     $labelWebserviceCallback = Mage::getSingleton('dpd/webservice')->getShippingLabel($recipient, $order, $shipment, $parcelshop);
                     if ($labelWebserviceCallback) {
-            -
                        Mage::helper('dpd')->generatePdfAndSave($labelWebserviceCallback->parcellabelsPDF, 'orderlabels', $order->getIncrementId(). "-" .$labelWebserviceCallback->shipmentResponses->parcelInformation->parcelLabelNumber);
-            -
                        return $order->getIncrementId(). "-" .$labelWebserviceCallback->shipmentResponses->parcelInformation->parcelLabelNumber;
                     } else {
                         return false;
+                    }


7	* @category Checkout
8	* @author PHPro (info@phpro.be)
9	*/
10	+
11	/**
12	* Class DPD_Shipping_Model_Adminhtml_DpdGrid
13	*/

112	{
113	$parcelshop = false;
114	$billingAddress = $order->getBillingAddress();
115	+ $shippingAddress = $order->getShippingAddress();






116	if (strpos($order->getShippingMethod(), 'parcelshop') !== false) {
117	$parcelshop = true;
118	}
119	+ if ($parcelshop) {
120	+ $recipient = array(
121	+ 'name1' => $billingAddress->getFirstname() . " " . $billingAddress->getLastname(),
122	+ 'name2' => $billingAddress->getCompany(),
123	+ 'street' => $billingAddress->getStreet(1) . " " . $billingAddress->getStreet(2),
124	+ 'country' => $billingAddress->getCountry(),
125	+ 'zipCode' => $billingAddress->getPostcode(),
126	+ 'city' => $billingAddress->getCity()
127	+ );
128	+ }
129	+ else{
130	+ $recipient = array(
131	+ 'name1' => $shippingAddress->getFirstname() . " " . $shippingAddress->getLastname(),
132	+ 'name2' => $shippingAddress->getCompany(),
133	+ 'street' => $shippingAddress->getStreet(1) . " " . $shippingAddress->getStreet(2),
134	+ 'country' => $shippingAddress->getCountry(),
135	+ 'zipCode' => $shippingAddress->getPostcode(),
136	+ 'city' => $shippingAddress->getCity()
137	+ );
138	+ }
139	$labelWebserviceCallback = Mage::getSingleton('dpd/webservice')->getShippingLabel($recipient, $order, $shipment, $parcelshop);
140
141	if ($labelWebserviceCallback) {
142	+ Mage::helper('dpd')->generatePdfAndSave($labelWebserviceCallback->parcellabelsPDF, 'orderlabels', $order->getIncrementId() . "-" . $labelWebserviceCallback->shipmentResponses->parcelInformation->parcelLabelNumber);
143	+ return $order->getIncrementId() . "-" . $labelWebserviceCallback->shipmentResponses->parcelInformation->parcelLabelNumber;
144	} else {
145	return false;
146	}

app/code/community/DPD/Shipping/Model/Observer.php CHANGED Viewed

@@ -7,6 +7,7 @@
              * @category     Checkout
              * @author       PHPro (info@phpro.be)
              */
             /**
              * Class DPD_Shipping_Model_Observer
              */
@@ -102,4 +103,45 @@ class DPD_Shipping_Model_Observer
                         $shipment->setTotalWeight($weight);
+                    }
+                }
+            }


7	* @category Checkout
8	* @author PHPro (info@phpro.be)
9	*/
10	+
11	/**
12	* Class DPD_Shipping_Model_Observer
13	*/

103	$shipment->setTotalWeight($weight);
104	}
105	}
106	+
107	+ /**
108	+ * If the checkout is a Onestepcheckout and dpdselected is true, we need to copy the address on submitting
109	+ *
110	+ * @param $observer
111	+ */
112	+ public function checkout_submit_all_after($observer)
113	+ {
114	+ if (Mage::helper('dpd')->getIsOnestepCheckout()) {
115	+ $quote = Mage::getSingleton('checkout/session')->getQuote();
116	+ $address = $quote->getShippingAddress();
117	+ if ($address->getShippingMethod() == "dpdparcelshops_dpdparcelshops" && (bool)$quote->getDpdSelected()) {
118	+ $address->unsetAddressId()
119	+ ->unsetTelephone()
120	+ ->setSaveInAddressBook(0)
121	+ ->setFirstname('DPD ParcelShop: ')
122	+ ->setLastname($quote->getDpdCompany())
123	+ ->setStreet($quote->getDpdStreet())
124	+ ->setCity($quote->getDpdCity())
125	+ ->setPostcode($quote->getDpdZipcode())
126	+ ->setCountryId($quote->getDpdCountry())
127	+ ->save();
128	+ }
129	+ $quote->setDpdSelected(0);
130	+ }
131	+ }
132	+
133	+ /**
134	+ * If Billing/Shipping address was changed, reset the DPD shipping Method.
135	+ *
136	+ * @param $observer
137	+ */
138	+ public function controller_action_predispatch_onestepcheckout_ajax_save_billing($observer)
139	+ {
140	+ if (Mage::helper('dpd')->getIsOnestepCheckout()) {
141	+ $quote = Mage::getSingleton('checkout/session')->getQuote();
142	+ if ($quote->getDpdSelected()) {
143	+ $quote->setDpdSelected(0);
144	+ }
145	+ }
146	+ }
147	}

app/code/community/DPD/Shipping/Model/Returnlabels.php CHANGED Viewed

	@@ -7,6 +7,7 @@
7	* @category Checkout
8	* @author PHPro (info@phpro.be)
9	*/

10	/**
11	* Class DPD_Shipping_Model_Returnlabels
12	*/
	@@ -29,27 +30,43 @@ class DPD_Shipping_Model_Returnlabels extends Mage_Core_Model_Abstract
29	public function generateLabelAndSave($orderId)
30	{
31	$order = Mage::getModel('sales/order')->load($orderId);
32	- ~~$billingAddress~~ = $order->~~getBillingAddress~~();
33	- $~~recipient~~ = ~~array(~~
34	- ~~'name1' => $billingAddress->getFirstname() . " " . $billingAddress->getLastname(),~~
35	- ~~'street'~~ => $~~billingAddress->getStreet(1~~) ~~. " " . $billingAddress->getStreet(2),~~
36	- ~~'country'~~ => $~~billingAddress~~->~~getCountry~~(),
37	- ~~'zipCode'~~ => ~~$billingAddress->getPostcode~~(),
38	- '~~city~~' => $billingAddress->~~getCity~~()
39	- );
















40	$returnlabel = Mage::getSingleton('dpd/webservice')->getReturnLabel($recipient);
41	- if(!$returnlabel){
42	return false;
43	}
44	//convertstring to pdf and save
45	- Mage::helper('dpd')->generatePdfAndSave($returnlabel->parcellabelsPDF, 'returnlabel', $order->getIncrementId() ."-". $returnlabel->shipmentResponses->parcelInformation->parcelLabelNumber);
46
47	//save labeldata for admin display
48	$returnLabelObject = new DPD_Shipping_Model_Returnlabels;
49	$returnLabelObject
50	->setLabelNumber($returnlabel->shipmentResponses->parcelInformation->parcelLabelNumber)
51	- ->setLabelPdfUrl( $order->getIncrementId() ."-".$returnlabel->shipmentResponses->parcelInformation->parcelLabelNumber . ".pdf")
52	- ->setLabelInstructionsUrl( $order->getIncrementId() ."-".$returnlabel->shipmentResponses->parcelInformation->parcelLabelNumber . "-instructions.pdf")
53	->setOrderId($orderId)
54	->save();
55	return $returnLabelObject->getId();
	@@ -73,11 +90,11 @@ class DPD_Shipping_Model_Returnlabels extends Mage_Core_Model_Abstract
73	$transactionalEmail = Mage::getModel('core/email_template')
74	->setDesignConfig(array('area' => 'frontend', 'store' => $order->getStoreId()));
75	foreach ($attachments as $pdf_attachment) {
76	- if (!empty($pdf_attachment) && file_exists(Mage::getBaseDir('media')."/dpd/returnlabel/".$pdf_attachment)) {
77	$transactionalEmail
78	->getMail()
79	->createAttachment(
80	- file_get_contents(Mage::getBaseDir('media')."/dpd/returnlabel/".$pdf_attachment),
81	Zend_Mime::TYPE_OCTETSTREAM,
82	Zend_Mime::DISPOSITION_ATTACHMENT,
83	Zend_Mime::ENCODING_BASE64,
	@@ -101,12 +118,13 @@ class DPD_Shipping_Model_Returnlabels extends Mage_Core_Model_Abstract
101	*
102	* @param $returnId
103	*/
104	- public function deleteEntryAndAttachments($returnId){

105	$returnLabel = Mage::getModel('dpd/returnlabels')->load($returnId);
106	$attachments = array($returnLabel->getLabelPdfUrl(), $returnLabel->getLabelInstructionsUrl());
107	foreach ($attachments as $pdf_attachment) {
108	- $file = Mage::getBaseDir('media')."/dpd/returnlabels/".$pdf_attachment;
109	- if(file_exists($file)){
110	unlink($file);
111	}
112	}
	@@ -120,41 +138,39 @@ class DPD_Shipping_Model_Returnlabels extends Mage_Core_Model_Abstract
120	* @param $returnId
121	* @return string
122	*/
123	- public function generateInstructionsPdf($orderId, $returnId){

124	$returnlabel = Mage::getModel('dpd/returnlabels')->load($returnId);
125	$pdf = Zend_Pdf::load(Mage::getBaseDir('skin') . DS . 'adminhtml' . DS . 'default' . DS . 'default' . DS . 'dpd' . DS . 'returnlabel' . DS . 'instructions.pdf');
126	$font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_BOLD);
127	$page = $pdf->pages[0];
128	$page->setFont($font, 15);
129	- if(Mage::getStoreConfig('design/email/logo') && strpos(Mage::getStoreConfig('design/email/logo'),'.gif') === false && Mage::getVersion() >= "1.7"){
130	- $uploadDir = Mage_Adminhtml_Model_System_Config_Backend_Email_Logo::UPLOAD_DIR;
131	- $fullFileName = Mage::getBaseDir('media') . DS . $uploadDir . DS . Mage::getStoreConfig('design/email/logo');
132	- $image = Zend_Pdf_Image::imageWithPath($fullFileName);
133	- $imgWidthPts = $image->getPixelWidth() * 72 / 96;
134	- $imgHeightPts = $image->getPixelHeight() * 72 / 96;
135	- $x1 = 50;
136	- $y1 = 687;
137	- $page->drawImage($image, $x1, $y1, $x1 + $imgWidthPts, $y1 + $imgHeightPts);
138	- }
139	- elseif(Mage::getVersion() < "1.7"){
140	- try{
141	- $fullFileName = Mage::getBaseDir('skin') . DS . 'frontend' . DS .'default' . DS . 'default' . DS . Mage::getStoreConfig('design/header/logo_src');
142	$image = Zend_Pdf_Image::imageWithPath($fullFileName);
143	- $imgWidthPts = $image->getPixelWidth() * 72 / 96;
144	$imgHeightPts = $image->getPixelHeight() * 72 / 96;
145	$x1 = 50;
146	$y1 = 687;
147	$page->drawImage($image, $x1, $y1, $x1 + $imgWidthPts, $y1 + $imgHeightPts);
148	- }
149	- ~~catch(Exception~~ ~~$e)~~{








150	Mage::helper('dpd')->log('Instructions PDF: No logo found or incorrect file format', Zend_Log::INFO);
151	}
152	- }
153	- else{
154	Mage::helper('dpd')->log('Instructions PDF: No logo found or incorrect file format', Zend_Log::INFO);
155	}
156	- $page->drawText(implode(' ',str_split($returnlabel->getLabelNumber(), 4)), '321', '215');
157	$order = Mage::getResourceModel('sales/order_collection')->addAttributeToSelect('increment_id')->addAttributeToFilter('entity_id', array('eq' => $orderId))->getFirstItem();
158	- Mage::helper('dpd')->generatePdfAndSave($pdf->render(),'returnlabel',$order->getIncrementId().'-'.$returnlabel->getLabelNumber()."-instructions");
159	}
160	}


7	* @category Checkout
8	* @author PHPro (info@phpro.be)
9	*/
10	+
11	/**
12	* Class DPD_Shipping_Model_Returnlabels
13	*/

30	public function generateLabelAndSave($orderId)
31	{
32	$order = Mage::getModel('sales/order')->load($orderId);
33	+ if (strpos($order->getShippingMethod(), 'parcelshop') !== false) {
34	+ $parcelshop = true;
35	+ }
36	+ if ($parcelshop) {
37	+ $billingAddress = $order->getBillingAddress();
38	+ $recipient = array(
39	+ 'name1' => $billingAddress->getFirstname() . " " . $billingAddress->getLastname(),
40	+ 'name2' => $billingAddress->getCompany(),
41	+ 'street' => $billingAddress->getStreet(1) . " " . $billingAddress->getStreet(2),
42	+ 'country' => $billingAddress->getCountry(),
43	+ 'zipCode' => $billingAddress->getPostcode(),
44	+ 'city' => $billingAddress->getCity()
45	+ );
46	+ } else {
47	+ $shippingAddress = $order->getShippingAddress();
48	+ $recipient = array(
49	+ 'name1' => $shippingAddress->getFirstname() . " " . $shippingAddress->getLastname(),
50	+ 'name2' => $shippingAddress->getCompany(),
51	+ 'street' => $shippingAddress->getStreet(1) . " " . $shippingAddress->getStreet(2),
52	+ 'country' => $shippingAddress->getCountry(),
53	+ 'zipCode' => $shippingAddress->getPostcode(),
54	+ 'city' => $shippingAddress->getCity()
55	+ );
56	+ }
57	$returnlabel = Mage::getSingleton('dpd/webservice')->getReturnLabel($recipient);
58	+ if (!$returnlabel) {
59	return false;
60	}
61	//convertstring to pdf and save
62	+ Mage::helper('dpd')->generatePdfAndSave($returnlabel->parcellabelsPDF, 'returnlabel', $order->getIncrementId() . "-" . $returnlabel->shipmentResponses->parcelInformation->parcelLabelNumber);
63
64	//save labeldata for admin display
65	$returnLabelObject = new DPD_Shipping_Model_Returnlabels;
66	$returnLabelObject
67	->setLabelNumber($returnlabel->shipmentResponses->parcelInformation->parcelLabelNumber)
68	+ ->setLabelPdfUrl($order->getIncrementId() . "-" . $returnlabel->shipmentResponses->parcelInformation->parcelLabelNumber . ".pdf")
69	+ ->setLabelInstructionsUrl($order->getIncrementId() . "-" . $returnlabel->shipmentResponses->parcelInformation->parcelLabelNumber . "-instructions.pdf")
70	->setOrderId($orderId)
71	->save();
72	return $returnLabelObject->getId();

90	$transactionalEmail = Mage::getModel('core/email_template')
91	->setDesignConfig(array('area' => 'frontend', 'store' => $order->getStoreId()));
92	foreach ($attachments as $pdf_attachment) {
93	+ if (!empty($pdf_attachment) && file_exists(Mage::getBaseDir('media') . "/dpd/returnlabel/" . $pdf_attachment)) {
94	$transactionalEmail
95	->getMail()
96	->createAttachment(
97	+ file_get_contents(Mage::getBaseDir('media') . "/dpd/returnlabel/" . $pdf_attachment),
98	Zend_Mime::TYPE_OCTETSTREAM,
99	Zend_Mime::DISPOSITION_ATTACHMENT,
100	Zend_Mime::ENCODING_BASE64,

118	*
119	* @param $returnId
120	*/
121	+ public function deleteEntryAndAttachments($returnId)
122	+ {
123	$returnLabel = Mage::getModel('dpd/returnlabels')->load($returnId);
124	$attachments = array($returnLabel->getLabelPdfUrl(), $returnLabel->getLabelInstructionsUrl());
125	foreach ($attachments as $pdf_attachment) {
126	+ $file = Mage::getBaseDir('media') . "/dpd/returnlabels/" . $pdf_attachment;
127	+ if (file_exists($file)) {
128	unlink($file);
129	}
130	}

138	* @param $returnId
139	* @return string
140	*/
141	+ public function generateInstructionsPdf($orderId, $returnId)
142	+ {
143	$returnlabel = Mage::getModel('dpd/returnlabels')->load($returnId);
144	$pdf = Zend_Pdf::load(Mage::getBaseDir('skin') . DS . 'adminhtml' . DS . 'default' . DS . 'default' . DS . 'dpd' . DS . 'returnlabel' . DS . 'instructions.pdf');
145	$font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_BOLD);
146	$page = $pdf->pages[0];
147	$page->setFont($font, 15);
148	+ if (Mage::getStoreConfig('design/email/logo') && strpos(Mage::getStoreConfig('design/email/logo'), '.gif') === false && Mage::getVersion() >= "1.7") {
149	+ $uploadDir = Mage_Adminhtml_Model_System_Config_Backend_Email_Logo::UPLOAD_DIR;
150	+ $fullFileName = Mage::getBaseDir('media') . DS . $uploadDir . DS . Mage::getStoreConfig('design/email/logo');










151	$image = Zend_Pdf_Image::imageWithPath($fullFileName);
152	+ $imgWidthPts = $image->getPixelWidth() * 72 / 96;
153	$imgHeightPts = $image->getPixelHeight() * 72 / 96;
154	$x1 = 50;
155	$y1 = 687;
156	$page->drawImage($image, $x1, $y1, $x1 + $imgWidthPts, $y1 + $imgHeightPts);
157	+ } elseif (Mage::getVersion() < "1.7") {
158	+ try {
159	+ $fullFileName = Mage::getBaseDir('skin') . DS . 'frontend' . DS . 'default' . DS . 'default' . DS . Mage::getStoreConfig('design/header/logo_src');
160	+ $image = Zend_Pdf_Image::imageWithPath($fullFileName);
161	+ $imgWidthPts = $image->getPixelWidth() * 72 / 96;
162	+ $imgHeightPts = $image->getPixelHeight() * 72 / 96;
163	+ $x1 = 50;
164	+ $y1 = 687;
165	+ $page->drawImage($image, $x1, $y1, $x1 + $imgWidthPts, $y1 + $imgHeightPts);
166	+ } catch (Exception $e) {
167	Mage::helper('dpd')->log('Instructions PDF: No logo found or incorrect file format', Zend_Log::INFO);
168	}
169	+ } else {

170	Mage::helper('dpd')->log('Instructions PDF: No logo found or incorrect file format', Zend_Log::INFO);
171	}
172	+ $page->drawText(implode(' ', str_split($returnlabel->getLabelNumber(), 4)), '321', '215');
173	$order = Mage::getResourceModel('sales/order_collection')->addAttributeToSelect('increment_id')->addAttributeToFilter('entity_id', array('eq' => $orderId))->getFirstItem();
174	+ Mage::helper('dpd')->generatePdfAndSave($pdf->render(), 'returnlabel', $order->getIncrementId() . '-' . $returnlabel->getLabelNumber() . "-instructions");
175	}
176	}

app/code/community/DPD/Shipping/Model/Webservice.php CHANGED Viewed

	@@ -31,17 +31,17 @@ class DPD_Shipping_Model_Webservice extends Mage_Core_Model_Abstract
31	/**
32	* Path to login webservice wsdl.
33	*/
34	- CONST WEBSERVICE_LOGIN = 'LoginService/V2_0?wsdl';
35
36	/**
37	* Path to ParcelShopFinder webservice wsdl.
38	*/
39	- CONST WEBSERVICE_PARCELSHOP = 'ParcelShopFinderService/V3_0?wsdl';
40
41	/**
42	* Path to Shipment webservice wsdl.
43	*/
44	- CONST WEBSERVICE_SHIPMENT = 'ShipmentService/V2_0?wsdl';
45
46	/**
47	* Product type for shipmentservice, should be always 'CL' as instructed by DPD.
	@@ -277,12 +277,18 @@ class DPD_Shipping_Model_Webservice extends Mage_Core_Model_Abstract
277	$result = $client->__soapCall($method, array($parameters));
278	$stop = true;
279
280	- if($result->orderResult->shipmentResponses->faults) {
281	Mage::helper('dpd')->log('Webservice ' . $method . ' failed:', Zend_Log::ERR);
282	- ~~Mage::helper~~(~~'dpd')->log~~($result->orderResult->shipmentResponses->faults~~, Zend_Log::ERR~~);





283	return false;
284	}
285

286	Mage::helper('dpd')->log('Webservice ' . $method . ' succeeded', Zend_Log::INFO);
287	Mage::helper('dpd')->log($result, Zend_Log::DEBUG);
288


31	/**
32	* Path to login webservice wsdl.
33	*/
34	+ CONST WEBSERVICE_LOGIN = 'LoginService/V2_0/?wsdl';
35
36	/**
37	* Path to ParcelShopFinder webservice wsdl.
38	*/
39	+ CONST WEBSERVICE_PARCELSHOP = 'ParcelShopFinderService/V3_0/?wsdl';
40
41	/**
42	* Path to Shipment webservice wsdl.
43	*/
44	+ CONST WEBSERVICE_SHIPMENT = 'ShipmentService/V2_0/?wsdl';
45
46	/**
47	* Product type for shipmentservice, should be always 'CL' as instructed by DPD.

277	$result = $client->__soapCall($method, array($parameters));
278	$stop = true;
279
280	+ if(isset($result->orderResult->shipmentResponses->faults) \|\| isset($result->orderResult->shipmentResponses->faultString)) {
281	Mage::helper('dpd')->log('Webservice ' . $method . ' failed:', Zend_Log::ERR);
282	+ if(isset($result->orderResult->shipmentResponses->faults)){
283	+ Mage::helper('dpd')->log($result->orderResult->shipmentResponses->faults, Zend_Log::ERR);
284	+ }
285	+ if(isset($result->orderResult->shipmentResponses->faultString)){
286	+ Mage::helper('dpd')->log($result->orderResult->shipmentResponses->faultString, Zend_Log::ERR);
287	+ }
288	return false;
289	}
290
291	+
292	Mage::helper('dpd')->log('Webservice ' . $method . ' succeeded', Zend_Log::INFO);
293	Mage::helper('dpd')->log($result, Zend_Log::DEBUG);
294

app/code/community/DPD/Shipping/controllers/AjaxController.php CHANGED Viewed

	@@ -55,6 +55,7 @@ class DPD_Shipping_AjaxController extends Mage_Core_Controller_Front_Action {
55
56	$quote->getShippingAddress()
57	->setShippingMethod('dpdparcelshops_dpdparcelshops')

58	->requestShippingRates();
59
60	$quote->save();


55
56	$quote->getShippingAddress()
57	->setShippingMethod('dpdparcelshops_dpdparcelshops')
58	+ ->setCollectShippingRates(true)
59	->requestShippingRates();
60
61	$quote->save();

app/code/community/DPD/Shipping/etc/config.xml CHANGED Viewed

	@@ -2,7 +2,7 @@
2	<config>
3	<modules>
4	<DPD_Shipping>
5	- <version>1.0.6</version>
6	</DPD_Shipping>
7	</modules>
8	<global>
	@@ -111,6 +111,23 @@
111	</dpdshipping>
112	</observers>
113	</checkout_controller_onepage_save_shipping_method>

















114	</events>
115	<routers>
116	<dpd>


2	<config>
3	<modules>
4	<DPD_Shipping>
5	+ <version>1.0.7</version>
6	</DPD_Shipping>
7	</modules>
8	<global>

111	</dpdshipping>
112	</observers>
113	</checkout_controller_onepage_save_shipping_method>
114	+ <controller_action_predispatch_onestepcheckout_ajax_save_billing>
115	+ <observers>
116	+ <dpdshippingonestepbilling>
117	+ <type>singleton</type>
118	+ <class>dpd/observer</class>
119	+ <method>controller_action_predispatch_onestepcheckout_ajax_save_billing</method>
120	+ </dpdshippingonestepbilling>
121	+ </observers>
122	+ </controller_action_predispatch_onestepcheckout_ajax_save_billing>
123	+ <checkout_submit_all_after>
124	+ <observers>
125	+ <dpdshippingonestepsave>
126	+ <class>dpd/observer</class>
127	+ <method>checkout_submit_all_after</method>
128	+ </dpdshippingonestepsave>
129	+ </observers>
130	+ </checkout_submit_all_after>
131	</events>
132	<routers>
133	<dpd>

app/design/frontend/base/default/layout/dpd_shipping.xml CHANGED Viewed

	@@ -17,6 +17,9 @@
17	<action method="addCss">
18	<name>css/dpd/window.css</name>
19	</action>



20	<block type="core/template" name="gmapsapi" template="dpd/gmapsapi.phtml"/>
21	</reference>
22	</dpd_checkout_header>
	@@ -53,4 +56,7 @@
53	<block type="shipping/tracking_popup" name="ordertracking" template="dpd/ordertracking.phtml" before="-"/>
54	</reference>
55	</shipping_tracking_popup>



56	</layout>


17	<action method="addCss">
18	<name>css/dpd/window.css</name>
19	</action>
20	+ <action method="addJs">
21	+ <file helper="dpd/data/getOnestepCheckoutJs"/>
22	+ </action>
23	<block type="core/template" name="gmapsapi" template="dpd/gmapsapi.phtml"/>
24	</reference>
25	</dpd_checkout_header>

56	<block type="shipping/tracking_popup" name="ordertracking" template="dpd/ordertracking.phtml" before="-"/>
57	</reference>
58	</shipping_tracking_popup>
59	+ <onestepcheckout_index_index>
60	+ <update handle="dpd_checkout_header"/>
61	+ </onestepcheckout_index_index>
62	</layout>

app/design/frontend/base/default/template/dpd/parcelshop.phtml CHANGED Viewed

	@@ -12,6 +12,9 @@
12	*/
13	?>
14	<?php



15	if (Mage::getStoreConfig('carriers/dpdparcelshops/google_maps_enable_list')) {
16	$shopswidth = 230;
17	} else {
	@@ -49,12 +52,23 @@ $html = $this->getShopsHtml();
49	window.dpdconfig = <?php echo $this->getConfig() ?>;
50	<?php if($this->getIsAjax() \|\| Mage::getStoreConfig('carriers/dpdparcelshops/google_maps_display')): ?>
51	window.dpdShipping = new DPD.Shipping('DPD_window_content', window.dpdconfig);


52	<?php else: ?>
53	window.dpdShipping = new DPD.Shipping('checkout-shipping-method-load', window.dpdconfig);
54	<?php endif; ?>
55	</script>
56	<div class="dpdclear"></div>
57	<?php else: ?>


58	<h2><?php echo Mage::helper('dpd')->__('No parcelshops were found, please verify your shipping address.') ?></h2>

59	<?php endif ?>
60	</div>


12	*/
13	?>
14	<?php
15	+ $shippingaddress = Mage::getSingleton('checkout/session')->getQuote()->getShippingAddress();
16	+ if(($shippingaddress->getPostcode() != "" && $shippingaddress->getPostcode() != "-") &&
17	+ ($shippingaddress->getCountryId()!= "" && $shippingaddress->getCountryId()!= "-")):
18	if (Mage::getStoreConfig('carriers/dpdparcelshops/google_maps_enable_list')) {
19	$shopswidth = 230;
20	} else {

52	window.dpdconfig = <?php echo $this->getConfig() ?>;
53	<?php if($this->getIsAjax() \|\| Mage::getStoreConfig('carriers/dpdparcelshops/google_maps_display')): ?>
54	window.dpdShipping = new DPD.Shipping('DPD_window_content', window.dpdconfig);
55	+ <?php elseif(Mage::helper('dpd')->getIsOnestepCheckout()): ?>
56	+ window.dpdShipping = new DPD.Shipping('.onestepcheckout-shipping-method', window.dpdconfig);
57	<?php else: ?>
58	window.dpdShipping = new DPD.Shipping('checkout-shipping-method-load', window.dpdconfig);
59	<?php endif; ?>
60	</script>
61	<div class="dpdclear"></div>
62	<?php else: ?>
63	+ <div class="dpderror">
64	+ <img src="<?php echo Mage::getDesign()->getSkinUrl('images/dpd/dpd_parcelshop_logo.png') ?>" alt="dpdlogo"/>
65	<h2><?php echo Mage::helper('dpd')->__('No parcelshops were found, please verify your shipping address.') ?></h2>
66	+ </div>
67	<?php endif ?>
68	</div>
69	+ <?php else: ?>
70	+ <div class="dpderror">
71	+ <img src="<?php echo Mage::getDesign()->getSkinUrl('images/dpd/dpd_parcelshop_logo.png') ?>" alt="dpdlogo"/>
72	+ <h2><?php echo Mage::helper('dpd')->__('No data found, please fill in the required shipping data.'); ?></h2>
73	+ </div>
74	+ <?php endif; ?>

app/design/frontend/base/default/template/dpd/parcelshoplink.phtml CHANGED Viewed

	@@ -15,7 +15,11 @@
15	<a href="#" id="showparcels"><?php echo Mage::helper('dpd')->__('Click here to select your ParcelShop') ?></a>
16	<script type="text/javascript">
17	var dpdconfig = <?php echo $this->getConfig() ?>;
18	- ~~var~~ ~~dpdShipping = new DPD.Shipping~~('~~checkout-shipping-method-load~~', ~~dpdconfig);~~




19	</script>
20	<input type="hidden" class="DPD-confirmed" value="0"/>
21	</div>


15	<a href="#" id="showparcels"><?php echo Mage::helper('dpd')->__('Click here to select your ParcelShop') ?></a>
16	<script type="text/javascript">
17	var dpdconfig = <?php echo $this->getConfig() ?>;
18	+ <?php if(Mage::helper('dpd')->getIsOnestepCheckout()): ?>
19	+ window.dpdShipping = new DPD.Shipping('.onestepcheckout-shipping-method', dpdconfig);
20	+ <?php else: ?>
21	+ window.dpdShipping = new DPD.Shipping('checkout-shipping-method-load', dpdconfig);
22	+ <?php endif; ?>
23	</script>
24	<input type="hidden" class="DPD-confirmed" value="0"/>
25	</div>

app/design/frontend/base/default/template/dpd/parcelshopselected.phtml CHANGED Viewed

	@@ -59,6 +59,10 @@ $this->getShopsHtml();
59	<input type="hidden" class="parcelshopId" value="<?php echo $quote->getDpdParcelshopId() ?>" />
60	<script type="text/javascript">
61	window.dpdconfig = <?php echo $this->getConfig() ?>;



62	window.dpdShipping = new DPD.Shipping('checkout-shipping-method-load', window.dpdconfig);

63	</script>
64	</div>


59	<input type="hidden" class="parcelshopId" value="<?php echo $quote->getDpdParcelshopId() ?>" />
60	<script type="text/javascript">
61	window.dpdconfig = <?php echo $this->getConfig() ?>;
62	+ <?php if(Mage::helper('dpd')->getIsOnestepCheckout()): ?>
63	+ window.dpdShipping = new DPD.Shipping('.onestepcheckout-shipping-method', window.dpdconfig);
64	+ <?php else: ?>
65	window.dpdShipping = new DPD.Shipping('checkout-shipping-method-load', window.dpdconfig);
66	+ <?php endif; ?>
67	</script>
68	</div>

app/etc/modules/DPD_Shipping.xml DELETED Viewed

@@ -1,9 +0,0 @@
-            -
            <?xml version="1.0"?>
-            -
            <config>
-            -
                <modules>
-            -
                    <DPD_Shipping>
-            -
                        <active>true</active>
-            -
                        <codePool>community</codePool>
-            -
                    </DPD_Shipping>
-            -
                </modules>
-            -
            </config>

app/locale/de_DE/DPD_Shipping.csv CHANGED Viewed

	@@ -83,4 +83,5 @@
83	"Zip/Postal Code","Postleitzahl"
84	"Generating a label can take up to 1 second per label, please be patient during this process. It can take up to maximum 2 minutes. Do you want to continue?"
85	"The maximum number of orders to process is %s. You selected %s. Please deselect some orders and try again."
86	- "No parcelshops were found, please verify your shipping address."


83	"Zip/Postal Code","Postleitzahl"
84	"Generating a label can take up to 1 second per label, please be patient during this process. It can take up to maximum 2 minutes. Do you want to continue?"
85	"The maximum number of orders to process is %s. You selected %s. Please deselect some orders and try again."
86	+ "No parcelshops were found, please verify your shipping address."
87	+ "No data found, please fill in the required shipping data.","Keine Daten gefunden, bitte in den erforderlichen Versanddaten zu füllen."

app/locale/en_US/DPD_Shipping.csv CHANGED Viewed

	@@ -84,4 +84,5 @@
84	"Zip/Postal Code", "Zip/Postal Code"
85	"Generating a label can take up to 1 second per label, please be patient during this process. It can take up to maximum 2 minutes. Do you want to continue?","Generating a label can take up to 1 second per label, please be patient during this process. It can take up to maximum 2 minutes. Do you want to continue?"
86	"The maximum number of orders to process is %s. You selected %s. Please deselect some orders and try again.","The maximum number of orders to process is %s. You selected %s. Please deselect some orders and try again."
87	- "No parcelshops were found, please verify your shipping address.","No parcelshops were found, please verify your shipping address."


84	"Zip/Postal Code", "Zip/Postal Code"
85	"Generating a label can take up to 1 second per label, please be patient during this process. It can take up to maximum 2 minutes. Do you want to continue?","Generating a label can take up to 1 second per label, please be patient during this process. It can take up to maximum 2 minutes. Do you want to continue?"
86	"The maximum number of orders to process is %s. You selected %s. Please deselect some orders and try again.","The maximum number of orders to process is %s. You selected %s. Please deselect some orders and try again."
87	+ "No parcelshops were found, please verify your shipping address.","No parcelshops were found, please verify your shipping address."
88	+ "No data found, please fill in the required shipping data.","No data found, please fill in the required shipping data."

app/locale/fr_FR/DPD_Shipping.csv DELETED Viewed

@@ -1,83 +0,0 @@
-            -
            "# of Items","Nombre d'articles"
-            -
            "%s orders already had downloaded labels.","% des commandes pour lesquelles des &eacute;tiquettes ont &eacute;t&eacute; t&eacute;l&eacute;charg&eacute;es"
-            -
            "A4","A4"
-            -
            "A6","A6"
-            -
            "Action","Action"
-            -
            "All labels have been downloaded.","Toutes les &eacute;tiquettes ont &eacute;t&eacute; t&eacute;l&eacute;charg&eacute;es"
-            -
            "An error occurred while import table rates.","Une erreur s'est produite lors de l'importation du plan tarifaire"
-            -
            "An error occurred while importing ParcelShops. Check the log for details.","Une erreur s'est produite lors de l'importation des ParcelShops. Contrôlez le fichier pour plus de d&eacute;tails"
-            -
            "Are you sure?","Etes-vous certain?"
-            -
            "Bill to Name","Facturer au nom de"
-            -
            "CSV Uploaded (%s shops).","CVS t&eacute;l&eacute;charg&eacute; (%s shops)."
-            -
            "Click here to change your ParcelShop", "Cliquer ici pour adapter votre DPD ParcelShop"
-            -
            "Click here to select your ParcelShop","Cliquer ici pour s&eacute;lectionner votre DPD ParcelShop"
-            -
            "Close this map","Fermer ce dossier"
-            -
            "closed","Ferm&eacute;"
-            -
            "Country","Pays"
-            -
            "DPD Label","Etiquette DPD"
-            -
            "DPD Orders","Commandes DPD"
-            -
            "DPD Return Label","Etiquette DPD retour"
-            -
            "DPD Return Labels","Etiquettes DPD retour"
-            -
            "DPD Type","DPD Type"
-            -
            "Date created","Date de cr&eacute;ation"
-            -
            "Delete","Supprimer"
-            -
            "Download DPD Label","T&eacute;l&eacute;charger une &eacute;tiquette DPD"
-            -
            "Download Instructions PDF","T&eacute;l&eacute;charger les instructions PDF"
-            -
            "Download Label PDF","T&eacute;l&eacute;charger l'&eacute;tiquette PDF"
-            -
            "Download all undownloaded","T&eacute;l&eacute;charger toutes les &eacute;tiquettes disponibles"
-            -
            "Download","T&eacute;l&eacute;charger"
-            -
            "Duplicate Row #%s (Country %s"", Region/State ""%s"", Zip ""%s"" and Value ""%s"").","Rang&eacute;e Double #%s (Pays %s"", R&eacute;gion/&eacute;tat ""%s"", Zip ""%s"" et Valeur ""%s"")."
-            -
            "Email","Email"
-            -
            "Excel XML","Excel XML"
-            -
            "Export CSV","Exporter CSV"
-            -
            "File has not been imported. See the following list of errors: %s","Le fichier n'a pas &eacute;t&eacute; import&eacute;. V&eacute;rifier les messages d'erreur"
-            -
            "Flat Rate","Prix fixe"
-            -
            "G.T. (Base)","G.T. (base)"
-            -
            "G.T. (Purchased)","G.T. (achet&eacute;)"
-            -
            "Generate Label and Complete","Cre&euml;er une &eacute;tiquette et quitter"
-            -
            "Inline","Inline"
-            -
            "Invalid %s "%s" in the Row #%s.","%s incorrect dans ligne %s"
-            -
            "Invalid Country "%s" in the Row #%s.","%s pays incorrect dans ligne %s"
-            -
            "Invalid ParcelShops format in the Row #%s","%s format ParcelShop  incorrect dans ligne %s"
-            -
            "Invalid Region/State "%s" in the Row #%s.","R&eacute;gion/province "%s" incorrect dans ligne %s"
-            -
            "Invalid Shipping Price "%s" in the Row #%s.","%s coûtes d'envoi incorrect dans ligne %s"
-            -
            "Invalid Table Rates File Format","Format de fichier du tableau de tarification incorrect"
-            -
            "Invalid Table Rates format in the Row #%s", "Format de fichier du tableau de tarification incorrect dans ligne %s"
-            -
            "Label Downloaded", "Etiquette t&eacute;l&eacute;charg&eacute;e"
-            -
            "Label number", "R&eacute;f&eacute;rence &eacute;tiquette"
-            -
            "Loading DPD parcelshop map based on your address...","Les ParcelShops DPD on &eacute;t&eacute; t&eacute;l&eacute;charg&eacute;s en fonction de votre adresse"
-            -
            "No CSV uploaded.","Aucun CVS n'a &eacute;t&eacute; t&eacute;l&eacute;charg&eacute;."
-            -
            "No label generated yet - please perform the 'Generate Label and Complete' action from the overview.","Etiquette pas encore cre&eacute;e - veuillez utiliser le 'Cre&eacute;er Etiquette et quitter' action de l'index.
-            -
            "No records found.","Aucun r&eacute;sultat"
-            -
            "No undownloaded labels found.","Aucune &eacute;tiquette disponible"
-            -
            "Order #","Commande n°"
-            -
            "Overlay","Overlay"
-            -
            "Please refresh the page after downloading to review the confirmation messages including any problems encountered. Continue?","Veuillez de nouveau charger la page si vous voulez v&eacute;rifier les messages de confirmation et les probl&eacute;mes rencont&eacute;s. Continuez?"
-            -
            "Please select a Parcelshop","Veuillez s&eacute;lectionner un ParcelShop DPD"
-            -
            "Purchased From (Store)","Achet&eacute; chez (boutique)"
-            -
            "Purchased On","Achet&eacute; le"
-            -
            "Region/State","R&eacute;gion/Province"
-            -
            "Ship to Name","Envoyer au nom de"
-            -
            "Ship to this ParcelShop.","Envoyer a ce Parcelshop"
-            -
            "Shipped with DPD generateLabelAndComplete","Envoy&eacute; avec une &eacute;tiquette DPD."
-            -
            "Shipping Price","Coûte d'envoi"
-            -
            "Some of the selected orders are not ready to be shipped or have already been shipped, operation canceled.","Certaines des commandes s&eacute;lectionn&eacute;es ne sont pas pr&ecirc;tes à l'envoi, ou sont d&eacute;jà envoy&eacute;. Demande annul&eacute;"
-            -
            "Something went wrong while processing order %s, please check your error logs.","Une erreur s'est produite lors du traitement de cette commande. Veuillez v&eacute;rifier votre fichier"
-            -
            "Status","Statut"
-            -
            "Table Rates","Tableau de tarification"
-            -
            "The ParcelShops for this website have been deleted.","Les ParcelShops DPD ont &eacute;t&eacute; retir&eacute;s de ce site."
-            -
            "The email with return label and instructions has been sent to %s.","Le &eacute;mail avec le &eacute;tiquette retour et les instructions ont &eacute;t&eacute; envoy&eacute;s à %s."
-            -
            "The file(s) could not be downloaded, please check your DPD logs.", "Le(s) fichier(s) n'ont pas pu &ecirc;tre t&eacute;l&eacute;charg&eacute;s. Veuillez contrôler votre journal DPD.
-            -
            "The order with id %s has only none dpd shipments.","Il n'y a pas d'exp&eacute;dition pr&eacute;vue pour votre commande ID"
-            -
            "The order with id %s is not ready to be shipped or has already been shipped.","La commande avec r&eacute;f&eacute;rence % n'est pas pr&ecirc;te ou a d&eacute;jà &eacute;t&eacute; envoy&eacute;e"
-            -
            "This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.","Cette option d'exp&eacute;dition est momentan&eacute;ment indisponible. Si vous voulez effectuer votre envoi via cette option, veuillez nous contacter"
-            -
            "Track this shipment","Suivre ce colis"
-            -
            "View","Afficher"
-            -
            "Your csv closed too soon with the ZZ ending. Please refer to the manual.","Votre csv a &eacute;t&eacute; referm&eacute; pr&eacute;matur&eacute;ment. Veuillez consulter votre manuel"
-            -
            "Your csv does not have the following required attributes %s on row %s.  Please refer to the manual.","Votre CSV ne contient pas les donn&eacute;es requises dans la ligne % Veuillez consulter votre manuel"
-            -
            "Your csv does not have the required AA header. Please refer to the manual.","Votre CSV n'a pas le format AA requis. Veuillez consulter votre manuel"
-            -
            "Your csv does not have the required ZZ ending. Please refer to the manual.","Votre CSV ne contient pas les ZZ requis dans la ligne % Veuillez consulter votre manuel"
-            -
            "%s label(s) have been generated and statuses have been changed.","Vos &eacute;tiquettes sont &eacute;dit&eacute;es et les statuts mis à jour"
-            -
            "Your return label and instructions file have been generated and is available under "DPD Return Labels" in this order.","Votre &eacute;tiquette retour et les instructions ont &eacute;t&eacute; cree&eacute;s et sont disponibles dans cette commande sous DPD &eacute;tiquettes retour"
-            -
            "Your selected order is not ready to be shipped or has already been shipped, operation canceled.", "La commande s&eacute;lectionn&eacute;e n'est pas pr&ecirc;te à l'envoi ou a d&eacute;jà &eacute;t&eacute; envoy&eacute;e. Demande annul&eacute;e.
-            -
            "Zip/Postal Code";"Code postal"

app/locale/nl_NL/DPD_Shipping.csv CHANGED Viewed

	@@ -84,3 +84,4 @@
84	"Generating a label can take up to 1 second per label, please be patient during this process. It can take up to maximum 2 minutes. Do you want to continue?","Een label aanmaken kan duren tot 1 seconde per label, gelieve geduldig te zijn gedurende dit proces. Het kan maximaal 2 minuten duren. Wilt u verder gaan?"
85	"The maximum number of orders to process is %s. You selected %s. Please deselect some orders and try again.","Het maximum aantal orders is %s; U selecteerde %s. Gelieve enkele orders te deselecteren en opnieuw te proberen."
86	"No parcelshops were found, please verify your shipping address.","Er werden geen DPD ParcelShops gevonden, gelieve uw adres te controleren."


84	"Generating a label can take up to 1 second per label, please be patient during this process. It can take up to maximum 2 minutes. Do you want to continue?","Een label aanmaken kan duren tot 1 seconde per label, gelieve geduldig te zijn gedurende dit proces. Het kan maximaal 2 minuten duren. Wilt u verder gaan?"
85	"The maximum number of orders to process is %s. You selected %s. Please deselect some orders and try again.","Het maximum aantal orders is %s; U selecteerde %s. Gelieve enkele orders te deselecteren en opnieuw te proberen."
86	"No parcelshops were found, please verify your shipping address.","Er werden geen DPD ParcelShops gevonden, gelieve uw adres te controleren."
87	+ "No data found, please fill in the required shipping data.","Geen gegevens gevonden, gelieve de vereiste verzendgegevens in te vullen."

js/dpd/onestepcheckout_shipping.js ADDED Viewed

	@@ -0,0 +1,68 @@


1	+ DPD.Shipping.addMethods({
2	+ initialize: function (container, config) {
3	+ if (container == "DPD_window_content") {
4	+ this.iframe = window.parent.document.getElementById('DPD_window_content');
5	+ innerDoc = this.iframe.contentDocument \|\| this.iframe.contentWindow.document;
6	+ this.container = innerDoc.getElementById('parcelshop');
7	+ }
8	+ else {
9	+ this.container = $$(container)[0];
10	+ }
11	+ this.config = config;
12	+ this.showParcelsLinkClick = this.displayParcelsInline.bind(this);
13	+ this.saveParcelShopClick = this.saveParcelShop.bind(this);
14	+ this.invalidateParcelLinkClick = this.invalidateParcel.bind(this);
15	+ this.saveShipping = this.updateProgressBlock.bind(this);
16	+ this.showExtraInfoHover = this.showExtraInfo.bind(this);
17	+ if (this.container.down('#map_canvas')) {
18	+ this.initGmaps();
19	+ }
20	+ if (this.container.down('.parcelshoplogo')) {
21	+ this.container.down('#s_method_dpdparcelshops_dpdparcelshops').checked = true;
22	+ this.setParcelshopImage();
23	+ }
24	+ this.bindEvents();
25	+ },
26	+ saveParcelShop: function (evt) {
27	+ if (this.container.id == "parcelshop") {
28	+ var shopId = evt.target.id;
29	+ setTimeout(function () {
30	+ parent.Windows.close("DPD_window", evt);
31	+ }, 1);
32	+ this.container = window.parent.document.getElementsByClassName('onestepcheckout-shipping-method-block')[0];
33	+ }
34	+ else {
35	+ var shopId = evt.target.id;
36	+ }
37	+ if (!shopId) {
38	+ shopId = evt.target.parentNode.id;
39	+ }
40	+ this.container.down('#s_method_dpdparcelshops_dpdparcelshops').checked = true;
41	+ var reloadurl = this.config.saveParcelUrl;
42	+ var data = this.config[shopId];
43	+ var loaderurl = this.config.loaderimage;
44	+ var parcelshop = this.container.down('#parcelshop');
45	+ parcelshop.update('<div class="dpdloaderwrapper" style="margin-bottom:35px;"><span class="dpdloader"></span><span class="message"></span></div><input type="hidden" class="DPD-confirmed" value="0"/>');
46	+
47	+ new parent.Ajax.Request(reloadurl, {
48	+ method: "POST",
49	+ asynchronous: false,
50	+ evalScripts: true,
51	+ parameters: data,
52	+ onSuccess: function(data) {
53	+ this.container.down('#dpd').update(data.responseText);
54	+ var price = this.container.down('#custom-shipping-amount').value;
55	+ var priceContainer = this.container.down('label[for="s_method_dpdparcelshops_dpdparcelshops"] span');
56	+ var oldPrice = priceContainer.innerHTML;
57	+ priceContainer.update(price);
58	+ this.container.down('#s_method_dpdparcelshops_dpdparcelshops').click();
59	+ if(price.substring(1) != oldPrice.substring(1)) {
60	+ priceContainer.addClassName('price-changed');
61	+ parent.setTimeout(function(){
62	+ priceContainer.removeClassName('price-changed');
63	+ }.bind(this), 2000)
64	+ }
65	+ }.bind(this)
66	+ });
67	+ }
68	+ })

js/dpd/shipping.js CHANGED Viewed

	@@ -183,7 +183,6 @@ DPD.Shipping = Class.create({
183	priceContainer.removeClassName('price-changed');
184	}.bind(this), 2000)
185	}
186	- checkout.reloadProgressBlock();
187	}.bind(this)
188	});
189


183	priceContainer.removeClassName('price-changed');
184	}.bind(this), 2000)
185	}

186	}.bind(this)
187	});
188

package.xml CHANGED Viewed

	@@ -1,18 +1,18 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>dpdshipping</name>
4	- <version>1.0.6</version>
5	<stability>stable</stability>
6	<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7	<channel>community</channel>
8	<extends/>
9	<summary>DPD Shipping</summary>
10	<description>DPD Shipping By PHPro</description>
11	- <notes>Added ~~the~~ ~~ability~~ to ~~make shipping to custom parcelshops free of charge~~</notes>
12	<authors><author><name>PHPro</name><user>heremke</user><email>info@phpro.be</email></author></authors>
13	- <date>2014-05-20</date>
14	- <time>15:26:33</time>
15	- <contents><target name="magecommunity"><dir name="DPD"><dir name="Shipping"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Grid"><dir name="Renderer"><file name="Shippingmethod.php" hash="b70aad5bba5c4eb5cc897dcc12e3c199"/></dir></dir><file name="Grid.php" hash="8b0c167082dd0dbdc91e7c52b5ba5e6b"/><dir name="View"><dir name="Tab"><file name="Returnlabels.php" hash="7917e9cd5107154a83561e9a399de876"/></dir></dir></dir><file name="Order.php" hash="3bf3e1fb85abbfe21a051442920ab479"/></dir><dir name="Shipping"><dir name="Carrier"><dir name="Dpdclassic"><dir name="Tablerate"><file name="Grid.php" hash="e7ac634260c5f6d3c70b5f9c8875f265"/></dir></dir><dir name="Dpdparcelshops"><dir name="Tablerate"><file name="Grid.php" hash="dfe9582089ac0729d66853415a5e57f3"/></dir></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><file name="Availability.php" hash="7883b99fbec71aa29486a81065476b12"/><file name="Dpdclassicexport.php" hash="b8bb24d799599844e8a9174f7dc4606c"/><file name="Dpdparcelshopsexport.php" hash="a5facc313e5249cc9d73249b40956a49"/></dir></dir></dir></dir><dir name="Carrier"><file name="Parcelshop.php" hash="04f72fb040c0808f953f0fefa758fa13"/></dir></dir><dir name="Helper"><file name="Data.php" hash="~~590ba1a9b25b15a71816a0ece6ecd198~~"/></dir><dir name="Model"><dir name="Adminhtml"><file name="Dpdgrid.php" hash="~~04df9b505ed4a4be409da14675d6117f~~"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><dir name="Dpdclassic"><file name="Tablerate.php" hash="2448a6974c41d4361a1125c7c26d02a9"/></dir><dir name="Dpdparcelshops"><file name="Tablerate.php" hash="259c9918f4c2e29a0d8478409da879e4"/></dir><file name="Specialparcelshops.php" hash="67d996d145f0206e9fab5954bf6b0063"/></dir></dir></dir></dir></dir><dir name="Carrier"><file name="Dpdclassic.php" hash="7a422443b2b84020a11bf268f7dd0451"/><file name="Dpdparcelshops.php" hash="5da790abc3bfc0e314a63970ed2c64b9"/></dir><dir name="Dpdclassic"><file name="Tablerate.php" hash="9cec2a0a694a1af5fc44fe9cbf3b8283"/></dir><dir name="Dpdparcelshops"><file name="Tablerate.php" hash="be1dfb643e62f3ea0a6c527b6ef88ca9"/></dir><dir name="Mysql4"><dir name="Dpdclassic"><dir name="Tablerate"><file name="Collection.php" hash="8eadb25daf3962f3adba71d380129683"/></dir><file name="Tablerate.php" hash="3e4c4062ad5b6e7c2e72262c28e6ca86"/></dir><dir name="Dpdparcelshops"><dir name="Tablerate"><file name="Collection.php" hash="bbfbfdcb550a97195e2f13e582d96d59"/></dir><file name="Tablerate.php" hash="4da8aeed439f685ea031ed73f09c17c6"/></dir><dir name="Returnlabels"><file name="Collection.php" hash="80fe36b9f31d150f02aebb64a769fc5d"/></dir><file name="Returnlabels.php" hash="1d75562904a21b572535483d2d086cdd"/><dir name="Specialparcelshops"><file name="Collection.php" hash="cd7d740fa52301b798ace547820473ef"/></dir><file name="Specialparcelshops.php" hash="64dd72846b549e7fd3a73e96c3542b54"/></dir><file name="Observer.php" hash="~~0e80c70924be85308ff8754abc142ce5~~"/><file name="Returnlabels.php" hash="~~5fa12afaf88cecc73cbd3d0f3163c6f2~~"/><file name="Specialparcelshops.php" hash="d1f2b72ffab70117fcd2b9f2820cd028"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Display.php" hash="af239a08df6796995e0c580d59d88c46"/><file name="Paperformat.php" hash="e0c638d918566a8b868cca06a459627b"/><file name="Ratetypes.php" hash="1fdeeb0624939d674d625e2c664f907c"/><file name="Weightunit.php" hash="857dd1b887f0f8485616107e6d66db01"/></dir></dir></dir><file name="Webservice.php" hash="~~9f7f542f04ddea210c1851838e05318f~~"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="DpdconfigController.php" hash="c04b8c67343fcb446948dde216cb7052"/><file name="DpdorderController.php" hash="7d325d000c3aa44cab90fdb275cbbece"/></dir><file name="AjaxController.php" hash="~~b2adf5b7c6c26fbe351b4944c8adb902~~"/></dir><dir name="etc"><file name="adminhtml.xml" hash="9b48a3489a485e86c8f2720a7a4380d8"/><file name="config.xml" hash="~~92884d043c0706b4f94406caf36cc0eb~~"/><file name="system.xml" hash="3b19eb465b3409f4cfe062bf698b1aa4"/></dir><dir name="sql"><dir name="dpd_setup"><file name="mysql4-install-0.0.1.php" hash="3dc22f7bf34a98be9b7f746e21832988"/><file name="mysql4-upgrade-0.0.1-0.0.2.php" hash="1d5467d1cc3b7ed2019bd6eb05aa1f08"/><file name="mysql4-upgrade-0.0.2-0.0.3.php" hash="a1a30b8234ef4b8cc26e220f559af25f"/><file name="mysql4-upgrade-0.0.3-0.0.4.php" hash="ee870d8941ff7f5565c148e6a26056bb"/><file name="mysql4-upgrade-0.0.4-0.0.5.php" hash="2d4632b58e315f3de7d630d41bd2d3f9"/><file name="mysql4-upgrade-0.0.5-0.0.6.php" hash="e75ee16a3c996fc9204a52f6a130f1c8"/><file name="mysql4-upgrade-0.0.6-0.0.7.php" hash="80226a27f1a62aeebef355490e89613a"/><file name="mysql4-upgrade-0.0.7-0.0.8.php" hash="14e65f350882cf315a7dc3779fbf4fc8"/><file name="mysql4-upgrade-0.0.8-0.0.9.php" hash="13712f377f95f127001df8ad31a33b9f"/><file name="mysql4-upgrade-0.0.9-0.1.0.php" hash="213b96a22d752e7d8059da44d17dec2a"/><file name="mysql4-upgrade-1.0.5-1.0.6.php" hash="d1b875f6e476a4485666621259ffd612"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="dpd"><file name="shipping.xml" hash="489b47b14eb3bec23bbfd254fda398df"/></dir></dir><dir name="template"><dir name="dpd"><dir name="order"><dir name="view"><dir name="tab"><file name="returnlabels.phtml" hash="cc2f679da3a728fbbe1ddc510c04cdae"/></dir></dir></dir><dir name="system"><dir name="config"><file name="availability.phtml" hash="5f17246a65c243bf0c8c4dfea499578e"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="dpd_shipping.xml" hash="~~05f2c2afda6a6732ee49b77ed074a947~~"/></dir><dir name="template"><dir name="dpd"><file name="gmapsapi.phtml" hash="e0073b425f55c844918b5c83aea20b1b"/><file name="ordertracking.phtml" hash="2273e469b6f129b2f174424ddebe83a3"/><file name="parcelshop.phtml" hash="~~9bd08955732d22e70e917c4189ccdb97~~"/><file name="parcelshoplink.phtml" hash="~~3a19aa648c56399d07aeeb803764719a~~"/><file name="parcelshopselected.phtml" hash="~~b2e10852f1c801a59bc98949c158ad89~~"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="DPD_Shipping.xml" hash="~~2014a79baf3f800f46222ceb11310d59~~"/></dir></target><target name="magelocale"><dir name="en_US"><file name="DPD_Shipping.csv" hash="~~5db7a4010010a70022aa3b5ee867d005~~"/><dir name="template"><dir name="email"><dir name="sales"><file name="dpd_returnlabel.html" hash="e5752017a877b81487e262ae2e5e3a40"/></dir></dir></dir></dir><dir name="de_DE"><file name="DPD_Shipping.csv" hash="~~cfaffcf986a75c05d3d06ba2ddc91e52~~"/><dir name="template"><dir name="email"><dir name="sales"><file name="dpd_returnlabel.html" hash="f7db3882a6f0067c410911298ef919a2"/></dir></dir></dir></dir><dir name="~~fr_FR~~"><file name="DPD_Shipping.csv" hash="~~df65ec21c388aa68fa5b95754e1a0e61~~"/><dir name="template"><dir name="email"><dir name="sales"><file name="dpd_returnlabel.html" hash="~~565cd604928a8474a4d62f42e1fc49a6~~"/></dir></dir></dir></dir><dir name="~~nl_NL~~"><~~file name="DPD_Shipping.csv" hash="cd4d80a1710639bf67994858dffce459"/><~~dir name="template"><dir name="email"><dir name="sales"><file name="dpd_returnlabel.html" hash="~~cd2911dd92a2a3ff14acb6fa9fc9ed16~~"/></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="dpd"><file name="shipping.js" hash="~~a8525ae2e6a39ad7df1ccacbdb0bd16a~~"/><dir name="window"><file name="shipping.js" hash="7ad8ea9367757797676269a40ec32067"/></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="dpd"><file name="shipping.css" hash="~~b37446a478b7cce62cf34279ee962d36~~"/><file name="window.css" hash="b0b31c19dd3b52e7408df6ab53e25dcd"/></dir></dir><dir name="images"><dir name="dpd"><file name="ajax-loader.gif" hash="f3dbc538b63d07156155acf0631ae375"/><file name="button_close.png" hash="040640376fe4f699f97f0d59b64e79cf"/><file name="dpd_parcelshop_logo.png" hash="43e479d6bb23dea74f2ec6ff8a1e390c"/><file name="icon_info.gif" hash="4c85c6937f19e50c5e871c2699e99bee"/><file name="icon_info.png" hash="53faeafe236c775f54752bc2008efa97"/><file name="icon_parcelshop.png" hash="202e38024b9f41483285a7b2d34d2a56"/><file name="icon_parcelshop_shadow.png" hash="263ee734ba6bb38060fd47a5b3de64ae"/><file name="icon_route.png" hash="fe07947b6f600723e682f2fcb8fca88f"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="dpd"><dir name="returnlabel"><file name="instructions.pdf" hash="2481e2a62ed1ea7c5b309dc70edece63"/></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>dpdshipping</name>
4	+ <version>1.0.7</version>
5	<stability>stable</stability>
6	<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7	<channel>community</channel>
8	<extends/>
9	<summary>DPD Shipping</summary>
10	<description>DPD Shipping By PHPro</description>
11	+ <notes>Added translate Files and Emails</notes>
12	<authors><author><name>PHPro</name><user>heremke</user><email>info@phpro.be</email></author></authors>
13	+ <date>2014-06-24</date>
14	+ <time>09:57:59</time>
15	+ <contents><target name="magecommunity"><dir name="DPD"><dir name="Shipping"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Grid"><dir name="Renderer"><file name="Shippingmethod.php" hash="b70aad5bba5c4eb5cc897dcc12e3c199"/></dir></dir><file name="Grid.php" hash="8b0c167082dd0dbdc91e7c52b5ba5e6b"/><dir name="View"><dir name="Tab"><file name="Returnlabels.php" hash="7917e9cd5107154a83561e9a399de876"/></dir></dir></dir><file name="Order.php" hash="3bf3e1fb85abbfe21a051442920ab479"/></dir><dir name="Shipping"><dir name="Carrier"><dir name="Dpdclassic"><dir name="Tablerate"><file name="Grid.php" hash="e7ac634260c5f6d3c70b5f9c8875f265"/></dir></dir><dir name="Dpdparcelshops"><dir name="Tablerate"><file name="Grid.php" hash="dfe9582089ac0729d66853415a5e57f3"/></dir></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><file name="Availability.php" hash="7883b99fbec71aa29486a81065476b12"/><file name="Dpdclassicexport.php" hash="b8bb24d799599844e8a9174f7dc4606c"/><file name="Dpdparcelshopsexport.php" hash="a5facc313e5249cc9d73249b40956a49"/></dir></dir></dir></dir><dir name="Carrier"><file name="Parcelshop.php" hash="04f72fb040c0808f953f0fefa758fa13"/></dir></dir><dir name="Helper"><file name="Data.php" hash="351a65c59caa16990d34f891b6a41bae"/></dir><dir name="Model"><dir name="Adminhtml"><file name="Dpdgrid.php" hash="8932dff306c5e8faff5975bd173e1c6b"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><dir name="Dpdclassic"><file name="Tablerate.php" hash="2448a6974c41d4361a1125c7c26d02a9"/></dir><dir name="Dpdparcelshops"><file name="Tablerate.php" hash="259c9918f4c2e29a0d8478409da879e4"/></dir><file name="Specialparcelshops.php" hash="67d996d145f0206e9fab5954bf6b0063"/></dir></dir></dir></dir></dir><dir name="Carrier"><file name="Dpdclassic.php" hash="7a422443b2b84020a11bf268f7dd0451"/><file name="Dpdparcelshops.php" hash="5da790abc3bfc0e314a63970ed2c64b9"/></dir><dir name="Dpdclassic"><file name="Tablerate.php" hash="9cec2a0a694a1af5fc44fe9cbf3b8283"/></dir><dir name="Dpdparcelshops"><file name="Tablerate.php" hash="be1dfb643e62f3ea0a6c527b6ef88ca9"/></dir><dir name="Mysql4"><dir name="Dpdclassic"><dir name="Tablerate"><file name="Collection.php" hash="8eadb25daf3962f3adba71d380129683"/></dir><file name="Tablerate.php" hash="3e4c4062ad5b6e7c2e72262c28e6ca86"/></dir><dir name="Dpdparcelshops"><dir name="Tablerate"><file name="Collection.php" hash="bbfbfdcb550a97195e2f13e582d96d59"/></dir><file name="Tablerate.php" hash="4da8aeed439f685ea031ed73f09c17c6"/></dir><dir name="Returnlabels"><file name="Collection.php" hash="80fe36b9f31d150f02aebb64a769fc5d"/></dir><file name="Returnlabels.php" hash="1d75562904a21b572535483d2d086cdd"/><dir name="Specialparcelshops"><file name="Collection.php" hash="cd7d740fa52301b798ace547820473ef"/></dir><file name="Specialparcelshops.php" hash="64dd72846b549e7fd3a73e96c3542b54"/></dir><file name="Observer.php" hash="3f9d7ceccf63701c16b596a0c31f1c27"/><file name="Returnlabels.php" hash="13886c6c9050d6f67a14b32af89362e6"/><file name="Specialparcelshops.php" hash="d1f2b72ffab70117fcd2b9f2820cd028"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Display.php" hash="af239a08df6796995e0c580d59d88c46"/><file name="Paperformat.php" hash="e0c638d918566a8b868cca06a459627b"/><file name="Ratetypes.php" hash="1fdeeb0624939d674d625e2c664f907c"/><file name="Weightunit.php" hash="857dd1b887f0f8485616107e6d66db01"/></dir></dir></dir><file name="Webservice.php" hash="fdffb6ac7e957be4bcfaa99731962459"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="DpdconfigController.php" hash="c04b8c67343fcb446948dde216cb7052"/><file name="DpdorderController.php" hash="7d325d000c3aa44cab90fdb275cbbece"/></dir><file name="AjaxController.php" hash="9e70595106f2dccd8b6d6b007f104d16"/></dir><dir name="etc"><file name="adminhtml.xml" hash="9b48a3489a485e86c8f2720a7a4380d8"/><file name="config.xml" hash="3d1b5d588300689315e53d936cbf0088"/><file name="system.xml" hash="3b19eb465b3409f4cfe062bf698b1aa4"/></dir><dir name="sql"><dir name="dpd_setup"><file name="mysql4-install-0.0.1.php" hash="3dc22f7bf34a98be9b7f746e21832988"/><file name="mysql4-upgrade-0.0.1-0.0.2.php" hash="1d5467d1cc3b7ed2019bd6eb05aa1f08"/><file name="mysql4-upgrade-0.0.2-0.0.3.php" hash="a1a30b8234ef4b8cc26e220f559af25f"/><file name="mysql4-upgrade-0.0.3-0.0.4.php" hash="ee870d8941ff7f5565c148e6a26056bb"/><file name="mysql4-upgrade-0.0.4-0.0.5.php" hash="2d4632b58e315f3de7d630d41bd2d3f9"/><file name="mysql4-upgrade-0.0.5-0.0.6.php" hash="e75ee16a3c996fc9204a52f6a130f1c8"/><file name="mysql4-upgrade-0.0.6-0.0.7.php" hash="80226a27f1a62aeebef355490e89613a"/><file name="mysql4-upgrade-0.0.7-0.0.8.php" hash="14e65f350882cf315a7dc3779fbf4fc8"/><file name="mysql4-upgrade-0.0.8-0.0.9.php" hash="13712f377f95f127001df8ad31a33b9f"/><file name="mysql4-upgrade-0.0.9-0.1.0.php" hash="213b96a22d752e7d8059da44d17dec2a"/><file name="mysql4-upgrade-1.0.5-1.0.6.php" hash="d1b875f6e476a4485666621259ffd612"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="dpd"><file name="shipping.xml" hash="489b47b14eb3bec23bbfd254fda398df"/></dir></dir><dir name="template"><dir name="dpd"><dir name="order"><dir name="view"><dir name="tab"><file name="returnlabels.phtml" hash="cc2f679da3a728fbbe1ddc510c04cdae"/></dir></dir></dir><dir name="system"><dir name="config"><file name="availability.phtml" hash="5f17246a65c243bf0c8c4dfea499578e"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="dpd_shipping.xml" hash="de035fc33a659e5f22e6dc76ac616eb0"/></dir><dir name="template"><dir name="dpd"><file name="gmapsapi.phtml" hash="e0073b425f55c844918b5c83aea20b1b"/><file name="ordertracking.phtml" hash="2273e469b6f129b2f174424ddebe83a3"/><file name="parcelshop.phtml" hash="14294a6481c403cd5167ce0cb13cf31f"/><file name="parcelshoplink.phtml" hash="e2fde828602b04e9eb6e8c26b6077986"/><file name="parcelshopselected.phtml" hash="dff97c974b3bb449dc8abdb8c1f764de"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="DPD_Shipping.xml" hash=""/></dir></target><target name="magelocale"><dir name="en_US"><file name="DPD_Shipping.csv" hash="89dc69f206a0ee6396fcc8a213a86354"/><dir name="template"><dir name="email"><dir name="sales"><file name="dpd_returnlabel.html" hash="e5752017a877b81487e262ae2e5e3a40"/></dir></dir></dir></dir><dir name="de_DE"><file name="DPD_Shipping.csv" hash="dad8bbae787e4328e07ce917a904860d"/><dir name="template"><dir name="email"><dir name="sales"><file name="dpd_returnlabel.html" hash="f7db3882a6f0067c410911298ef919a2"/></dir></dir></dir></dir><dir name="fr_DR"><file name="DPD_Shipping.csv" hash=""/></dir><dir name="nl_NL"><file name="DPD_Shipping.csv" hash="5538d6053277df2da478b2d0f5f3a806"/><dir name="template"><dir name="email"><dir name="sales"><file name="dpd_returnlabel.html" hash="cd2911dd92a2a3ff14acb6fa9fc9ed16"/></dir></dir></dir></dir><dir name="fr_FR"><dir name="template"><dir name="email"><dir name="sales"><file name="dpd_returnlabel.html" hash="565cd604928a8474a4d62f42e1fc49a6"/></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="dpd"><file name="onestepcheckout_shipping.js" hash="e3cce95f7b071c7560a7b5ddfb7f024c"/><file name="shipping.js" hash="620eca95f1de0f20d9336567062c5238"/><dir name="window"><file name="shipping.js" hash="7ad8ea9367757797676269a40ec32067"/></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="dpd"><file name="shipping.css" hash="a0996bb45a96e7228efe417715f79cc1"/><file name="window.css" hash="b0b31c19dd3b52e7408df6ab53e25dcd"/></dir></dir><dir name="images"><dir name="dpd"><file name="ajax-loader.gif" hash="f3dbc538b63d07156155acf0631ae375"/><file name="button_close.png" hash="040640376fe4f699f97f0d59b64e79cf"/><file name="dpd_parcelshop_logo.png" hash="43e479d6bb23dea74f2ec6ff8a1e390c"/><file name="icon_info.gif" hash="4c85c6937f19e50c5e871c2699e99bee"/><file name="icon_info.png" hash="53faeafe236c775f54752bc2008efa97"/><file name="icon_parcelshop.png" hash="202e38024b9f41483285a7b2d34d2a56"/><file name="icon_parcelshop_shadow.png" hash="263ee734ba6bb38060fd47a5b3de64ae"/><file name="icon_route.png" hash="fe07947b6f600723e682f2fcb8fca88f"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="dpd"><dir name="returnlabel"><file name="instructions.pdf" hash="2481e2a62ed1ea7c5b309dc70edece63"/></dir></dir></dir></dir></dir></target></contents>
16	<compatible/>
17	<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18	</package>

skin/frontend/base/default/css/dpd/shipping.css CHANGED Viewed

@@ -22,4 +22,11 @@
             .parcelshopwrapper .shop-details{padding-top: 9px;padding-bottom: 5px;}
             .parcelshopwrapper .shop-details li{margin:0;}
             .parcelshopwrapper .shop-data{background-color: #E7F1FA;border-bottom: 1px solid #FFF;color: #666;padding-left:10px;padding-right:10px;}
-            -
            .parcelshopwrapper .dpd_close_map{float: right;margin-right: 20px;margin-top: 5px;margin-bottom: 5px;}


22	.parcelshopwrapper .shop-details{padding-top: 9px;padding-bottom: 5px;}
23	.parcelshopwrapper .shop-details li{margin:0;}
24	.parcelshopwrapper .shop-data{background-color: #E7F1FA;border-bottom: 1px solid #FFF;color: #666;padding-left:10px;padding-right:10px;}
25	+ .parcelshopwrapper .dpd_close_map{float: right;margin-right: 20px;margin-top: 5px;margin-bottom: 5px;}
26	+ .dpderror{text-align: center; margin-top: 30%;}
27	+ .dpderror img{padding-bottom: 15px;}
28	+ .onestepcheckout-shipping-method-block img.parcelshoplogo{display:none;}
29	+ .onestepcheckout-shipping-method-block .parcelshopwrapper .extrainfowrapper{z-index:2;}
30	+ .onestepcheckout-shipping-method-block .parcelshopwrapper ul li{padding:0px;}
31	+ .onestepcheckout-shipping-method-block .parcelshopwrapper ul {padding-top:5px; padding-bottom:5px;}
32	+ .onestepcheckout-shipping-method-block .parcelshopwrapper ul li.dpdinfo{font-weight:bold;}