Version Notes
- Added various improvements to Eabi_Postoffice package, required to update only if you are using modules, which depend on those updates
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Eabi_DpdEE |
| Version | 0.1.12 |
| Comparing to | |
| See all releases | |
Code changes from version 0.1.11 to 0.1.12
- app/code/community/Eabi/DpdEE/CHANGELOG.txt +5 -0
- app/code/community/Eabi/DpdEE/etc/config.xml +1 -1
- app/code/community/Eabi/Postoffice/Model/Carrier/Abstract.php +158 -4
- app/code/community/Eabi/Postoffice/Model/Observer.php +4 -0
- app/code/community/Eabi/Postoffice/controllers/Adminhtml/PostofficeController.php +22 -5
- app/code/community/Eabi/Postoffice/controllers/IndexController.php +23 -5
- app/code/community/Eabi/Postoffice/etc/config.xml +1 -1
- app/design/adminhtml/default/default/layout/eabi_postoffice.xml +2 -2
- app/design/frontend/base/default/layout/eabi_postoffice.xml +7 -0
- app/etc/modules/Eabi_DpdEE.xml +1 -1
- app/etc/modules/Eabi_Postoffice.xml +1 -1
- app/locale/en_US/Eabi_Postoffice.csv +7 -0
- app/locale/et_EE/Eabi_Postoffice.csv +6 -0
- app/locale/fi_FI/Eabi_Postoffice.csv +6 -0
- app/locale/hu_HU/Eabi_Postoffice.csv +6 -0
- app/locale/lt_LT/Eabi_Postoffice.csv +6 -0
- app/locale/ru_RU/Eabi_Postoffice.csv +6 -0
- app/locale/sv_SE/Eabi_Postoffice.csv +6 -0
- package.xml +5 -7
- skin/adminhtml/default/default/eabi_postoffice.css +121 -0
- skin/frontend/base/default/css/eabi_postoffice.css +89 -0
- skin/frontend/default/default/css/eabi_postoffice.css +89 -0
app/code/community/Eabi/DpdEE/CHANGELOG.txt
CHANGED
|
@@ -36,3 +36,8 @@
|
|
| 36 |
- Changed timezone ETC/GMT+0 to Etc/GMT+0 because of errors on some servers
|
| 37 |
- Added event listener before checkout commit to throw exception when parcel terminal is not selected
|
| 38 |
- Added event listener for sending out e-mail on data send success and fetching email from corresponding shipping method model
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 36 |
- Changed timezone ETC/GMT+0 to Etc/GMT+0 because of errors on some servers
|
| 37 |
- Added event listener before checkout commit to throw exception when parcel terminal is not selected
|
| 38 |
- Added event listener for sending out e-mail on data send success and fetching email from corresponding shipping method model
|
| 39 |
+
|
| 40 |
+
0.1.12
|
| 41 |
+
- Added various improvements to Eabi_Postoffice package, required to update only if you are using modules, which depend on those updates
|
| 42 |
+
|
| 43 |
+
|
app/code/community/Eabi/DpdEE/etc/config.xml
CHANGED
|
@@ -36,7 +36,7 @@
|
|
| 36 |
<config>
|
| 37 |
<modules>
|
| 38 |
<Eabi_DpdEE>
|
| 39 |
-
<version>0.1.
|
| 40 |
</Eabi_DpdEE>
|
| 41 |
</modules>
|
| 42 |
|
| 36 |
<config>
|
| 37 |
<modules>
|
| 38 |
<Eabi_DpdEE>
|
| 39 |
+
<version>0.1.12</version>
|
| 40 |
</Eabi_DpdEE>
|
| 41 |
</modules>
|
| 42 |
|
app/code/community/Eabi/Postoffice/Model/Carrier/Abstract.php
CHANGED
|
@@ -392,9 +392,9 @@ abstract class Eabi_Postoffice_Model_Carrier_Abstract extends Mage_Shipping_Mode
|
|
| 392 |
$loadingText = Mage::helper('eabi_postoffice')->__('Loading offices...');
|
| 393 |
$html = '';
|
| 394 |
if ($this->_isMultishipping($request)) {
|
| 395 |
-
$html .= '<div id="eabi_carrier_'.$addressId.'_'.$this->_code.'" style="display:inline-block;">'.$loadingText.'</div>';
|
| 396 |
} else {
|
| 397 |
-
$html .= '<div id="eabi_carrier_'.$this->_code.'" style="display:inline-block;"></div>';
|
| 398 |
}
|
| 399 |
$url = Mage::getUrl('eabi_postoffice/index/office', array('_secure' => true));
|
| 400 |
|
|
@@ -423,7 +423,7 @@ abstract class Eabi_Postoffice_Model_Carrier_Abstract extends Mage_Shipping_Mode
|
|
| 423 |
address_id: '{$addressId}',
|
| 424 |
},
|
| 425 |
onSuccess: function(transport) {
|
| 426 |
-
$('{$divId}').update(transport.
|
| 427 |
}
|
| 428 |
});
|
| 429 |
/* ]]> */
|
|
@@ -476,7 +476,7 @@ EOT;
|
|
| 476 |
//TODO: add the method if we are able to detect the postoffice automatically
|
| 477 |
$additionalOffices = $this->getOfficesFromAddress($request);
|
| 478 |
foreach ($additionalOffices as $office) {
|
| 479 |
-
$methodName = $this->_code .'_' .$office->
|
| 480 |
if (!isset($addedMethods[$methodName])) {
|
| 481 |
$method = Mage::getModel('shipping/rate_result_method');
|
| 482 |
$method->setCarrier($this->_code);
|
|
@@ -729,6 +729,134 @@ EOT;
|
|
| 729 |
public function getGroupTitle(Eabi_Postoffice_Model_Office $office) {
|
| 730 |
return htmlspecialchars($office->getGroupName());
|
| 731 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 732 |
/**
|
| 733 |
* Determines how name of customer selected postoffice should be rendered and this is also how merchant sees the selected postoffice.
|
| 734 |
*
|
|
@@ -1013,6 +1141,28 @@ EOT;
|
|
| 1013 |
return true;
|
| 1014 |
}
|
| 1015 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1016 |
/**
|
| 1017 |
* <p>Gets current carrier code for usage in other helper classes.</p>
|
| 1018 |
* @return string
|
|
@@ -1039,6 +1189,10 @@ EOT;
|
|
| 1039 |
return Mage::getModel('catalog/product');
|
| 1040 |
}
|
| 1041 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1042 |
|
| 1043 |
/**
|
| 1044 |
*
|
| 392 |
$loadingText = Mage::helper('eabi_postoffice')->__('Loading offices...');
|
| 393 |
$html = '';
|
| 394 |
if ($this->_isMultishipping($request)) {
|
| 395 |
+
$html .= '<div id="eabi_carrier_'.$addressId.'_'.$this->_code.'" class="eabi_carrier eabi_carrier_' . $this->_code. '" style="display:inline-block;">'.$loadingText.'</div>';
|
| 396 |
} else {
|
| 397 |
+
$html .= '<div id="eabi_carrier_'.$this->_code.'" style="display:inline-block;" class="eabi_carrier eabi_carrier_' . $this->_code. '"></div>';
|
| 398 |
}
|
| 399 |
$url = Mage::getUrl('eabi_postoffice/index/office', array('_secure' => true));
|
| 400 |
|
| 423 |
address_id: '{$addressId}',
|
| 424 |
},
|
| 425 |
onSuccess: function(transport) {
|
| 426 |
+
$('{$divId}').update(transport.responseJSON.html);
|
| 427 |
}
|
| 428 |
});
|
| 429 |
/* ]]> */
|
| 476 |
//TODO: add the method if we are able to detect the postoffice automatically
|
| 477 |
$additionalOffices = $this->getOfficesFromAddress($request);
|
| 478 |
foreach ($additionalOffices as $office) {
|
| 479 |
+
$methodName = $this->_code .'_' .$office->getRemotePlaceId();
|
| 480 |
if (!isset($addedMethods[$methodName])) {
|
| 481 |
$method = Mage::getModel('shipping/rate_result_method');
|
| 482 |
$method->setCarrier($this->_code);
|
| 729 |
public function getGroupTitle(Eabi_Postoffice_Model_Office $office) {
|
| 730 |
return htmlspecialchars($office->getGroupName());
|
| 731 |
}
|
| 732 |
+
|
| 733 |
+
|
| 734 |
+
/**
|
| 735 |
+
* <p>Should return extra comment for the selected postoffice. For example shipping time.</p>
|
| 736 |
+
* <p>Extra comment is displayed next to select menu just before price display</p>
|
| 737 |
+
* <p>Returning boolean false causes comment to be hidden</p>
|
| 738 |
+
* @param Eabi_Postoffice_Model_Office $office
|
| 739 |
+
* @return boolean|string
|
| 740 |
+
*/
|
| 741 |
+
public final function getTerminalComment(Eabi_Postoffice_Model_Office $office) {
|
| 742 |
+
$terminalCommentResult = new Varien_Object(array(
|
| 743 |
+
'comment' => false,
|
| 744 |
+
'is_error' => false,
|
| 745 |
+
));
|
| 746 |
+
//get descriptional message (not to do it now)
|
| 747 |
+
//get future shipping date -> supply start date as parameter
|
| 748 |
+
//get disabled with message
|
| 749 |
+
|
| 750 |
+
$shippingTimestamp = $this->_getDeliveryTime($office);
|
| 751 |
+
if ($shippingTimestamp !== false && $this->getConfigData('show_delivery_time')) {
|
| 752 |
+
$date = date('d.m.Y', $shippingTimestamp);
|
| 753 |
+
$time = date('H:i', $shippingTimestamp);
|
| 754 |
+
$dateDiff = (int)(($this->__removeTimePart($shippingTimestamp) - $this->__removeTimePart(time())) / 86400);
|
| 755 |
+
switch ($dateDiff) {
|
| 756 |
+
case 0:
|
| 757 |
+
$date = $this->_getOfficeHelper()->__('today');
|
| 758 |
+
break;
|
| 759 |
+
case 1:
|
| 760 |
+
$date = $this->_getOfficeHelper()->__('tomorrow');
|
| 761 |
+
break;
|
| 762 |
+
case 2:
|
| 763 |
+
$date = $this->_getOfficeHelper()->__('day after tomorrow');
|
| 764 |
+
break;
|
| 765 |
+
}
|
| 766 |
+
if ($time == '00:00') {
|
| 767 |
+
$terminalCommentResult->setComment($this->_getOfficeHelper()->__('Delivery on %s', $date));
|
| 768 |
+
} else {
|
| 769 |
+
$terminalCommentResult->setComment($this->_getOfficeHelper()->__('Delivery on %1$s by %2$s', $date, $time));
|
| 770 |
+
}
|
| 771 |
+
}
|
| 772 |
+
|
| 773 |
+
//if we have an error
|
| 774 |
+
$disabledComment = $this->_getDisabledComment($office);
|
| 775 |
+
|
| 776 |
+
if ($disabledComment) {
|
| 777 |
+
$terminalCommentResult->setIsError(true);
|
| 778 |
+
$terminalCommentResult->setComment($disabledComment);
|
| 779 |
+
|
| 780 |
+
//remove selected shipping method (todo at some later date)
|
| 781 |
+
|
| 782 |
+
}
|
| 783 |
+
|
| 784 |
+
Mage::dispatchEvent('eabi_' . $this->_code . '_get_terminal_comment', array(
|
| 785 |
+
'selected_office' => $office,
|
| 786 |
+
'shipment_method' => $this,
|
| 787 |
+
'terminal_comment_result' => $terminalCommentResult,
|
| 788 |
+
));
|
| 789 |
+
|
| 790 |
+
return $terminalCommentResult;
|
| 791 |
+
}
|
| 792 |
+
|
| 793 |
+
/**
|
| 794 |
+
* <p>Returns calculated delivery time for the specified office</p>
|
| 795 |
+
* <p>If no delivery time calculation is available, then boolean FALSE is returned</p>
|
| 796 |
+
* @param Eabi_Postoffice_Model_Office $office
|
| 797 |
+
* @return boolean|int
|
| 798 |
+
*/
|
| 799 |
+
protected function _getDeliveryTime(Eabi_Postoffice_Model_Office $office) {
|
| 800 |
+
return false;
|
| 801 |
+
}
|
| 802 |
+
|
| 803 |
+
/**
|
| 804 |
+
* <p>Should return string text, when specified pickup-point is disabled.</p>
|
| 805 |
+
* <p>If specified pickup-point should not be disabled then this method returns boolean FALSE</p>
|
| 806 |
+
* @param Eabi_Postoffice_Model_Office $office
|
| 807 |
+
* @return boolean|string
|
| 808 |
+
*/
|
| 809 |
+
protected function _getDisabledComment(Eabi_Postoffice_Model_Office $office) {
|
| 810 |
+
return false;
|
| 811 |
+
}
|
| 812 |
+
|
| 813 |
+
|
| 814 |
+
|
| 815 |
+
|
| 816 |
+
|
| 817 |
+
protected function _getStartingDayStamp($timestamp) {
|
| 818 |
+
$limitTime = $this->getConfigData('same_day_time_limit');
|
| 819 |
+
if (!$limitTime) {
|
| 820 |
+
return null;
|
| 821 |
+
}
|
| 822 |
+
$resultTimestamp = $timestamp;
|
| 823 |
+
|
| 824 |
+
$currentTimeParts = explode(',', date('H,i,s', $timestamp));
|
| 825 |
+
$limitTimeParts = explode(',', $limitTime);
|
| 826 |
+
$weekDayToLook = (int)date('N', $timestamp);
|
| 827 |
+
//1 = monday
|
| 828 |
+
//7 = sunday
|
| 829 |
+
|
| 830 |
+
|
| 831 |
+
if ($this->_getSeconds($currentTimeParts) > $this->_getSeconds($limitTimeParts)) {
|
| 832 |
+
//first day is tomorrow
|
| 833 |
+
$weekDayToLook++;
|
| 834 |
+
$resultTimestamp += (int)(24 * 3600);
|
| 835 |
+
} else {
|
| 836 |
+
//first day is today
|
| 837 |
+
}
|
| 838 |
+
|
| 839 |
+
if ($weekDayToLook > 7) {
|
| 840 |
+
$weekDayToLook -= 7;
|
| 841 |
+
}
|
| 842 |
+
|
| 843 |
+
|
| 844 |
+
return $this->__removeTimePart($resultTimestamp);
|
| 845 |
+
|
| 846 |
+
}
|
| 847 |
+
|
| 848 |
+
|
| 849 |
+
/**
|
| 850 |
+
* <p>Removes hours, minutes, seconds from specified timestamp and returns the result</p>
|
| 851 |
+
* @param int $timestamp
|
| 852 |
+
* @return int
|
| 853 |
+
*/
|
| 854 |
+
private function __removeTimePart($timestamp) {
|
| 855 |
+
$dateParts = explode(',', date('d,m,Y', $timestamp));
|
| 856 |
+
return mktime(0, 0, 0, $dateParts[1], $dateParts[0], $dateParts[2]);
|
| 857 |
+
}
|
| 858 |
+
|
| 859 |
+
|
| 860 |
/**
|
| 861 |
* Determines how name of customer selected postoffice should be rendered and this is also how merchant sees the selected postoffice.
|
| 862 |
*
|
| 1141 |
return true;
|
| 1142 |
}
|
| 1143 |
|
| 1144 |
+
/**
|
| 1145 |
+
* <p>Converts array input of three elements into seconds</p>
|
| 1146 |
+
* <p>First element in array should represent hours</p>
|
| 1147 |
+
* <p>Second element in array should represent minutes</p>
|
| 1148 |
+
* <p>Third element in array should represent seconds</p>
|
| 1149 |
+
* @param array $input
|
| 1150 |
+
* @return int
|
| 1151 |
+
*/
|
| 1152 |
+
protected function _getSeconds($input) {
|
| 1153 |
+
$multipliers = array(
|
| 1154 |
+
3600,
|
| 1155 |
+
60,
|
| 1156 |
+
1,
|
| 1157 |
+
);
|
| 1158 |
+
$sum = 0;
|
| 1159 |
+
foreach ($multipliers as $i => $multiplier) {
|
| 1160 |
+
$sum += (int)($input[$i] * $multiplier);
|
| 1161 |
+
}
|
| 1162 |
+
return $sum;
|
| 1163 |
+
}
|
| 1164 |
+
|
| 1165 |
+
|
| 1166 |
/**
|
| 1167 |
* <p>Gets current carrier code for usage in other helper classes.</p>
|
| 1168 |
* @return string
|
| 1189 |
return Mage::getModel('catalog/product');
|
| 1190 |
}
|
| 1191 |
|
| 1192 |
+
protected function _getOfficeModel() {
|
| 1193 |
+
return Mage::getModel('eabi_postoffice/office');
|
| 1194 |
+
}
|
| 1195 |
+
|
| 1196 |
|
| 1197 |
/**
|
| 1198 |
*
|
app/code/community/Eabi/Postoffice/Model/Observer.php
CHANGED
|
@@ -141,6 +141,7 @@ class Eabi_Postoffice_Model_Observer {
|
|
| 141 |
|
| 142 |
$mailer = $this->_getEmailerModel();
|
| 143 |
|
|
|
|
| 144 |
|
| 145 |
Mage::dispatchEvent('eabi_' . $shipmentMethod->getCode() . '_autosend_data_success', array(
|
| 146 |
'request' => $request,
|
|
@@ -165,6 +166,9 @@ class Eabi_Postoffice_Model_Observer {
|
|
| 165 |
'payment_html' => $paymentBlockHtml
|
| 166 |
)
|
| 167 |
);
|
|
|
|
|
|
|
|
|
|
| 168 |
$mailer->send();
|
| 169 |
|
| 170 |
|
| 141 |
|
| 142 |
$mailer = $this->_getEmailerModel();
|
| 143 |
|
| 144 |
+
|
| 145 |
|
| 146 |
Mage::dispatchEvent('eabi_' . $shipmentMethod->getCode() . '_autosend_data_success', array(
|
| 147 |
'request' => $request,
|
| 166 |
'payment_html' => $paymentBlockHtml
|
| 167 |
)
|
| 168 |
);
|
| 169 |
+
|
| 170 |
+
|
| 171 |
+
|
| 172 |
$mailer->send();
|
| 173 |
|
| 174 |
|
app/code/community/Eabi/Postoffice/controllers/Adminhtml/PostofficeController.php
CHANGED
|
@@ -176,6 +176,11 @@ class Eabi_Postoffice_Adminhtml_PostofficeController extends Mage_Adminhtml_Cont
|
|
| 176 |
public function officeAction() {
|
| 177 |
try {
|
| 178 |
if ($this->getRequest()->isPost()) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 179 |
|
| 180 |
$post = $this->getRequest()->getPost();
|
| 181 |
$storeId = (int)$this->getRequest()->getParam('store_id', 0);
|
|
@@ -205,10 +210,20 @@ class Eabi_Postoffice_Adminhtml_PostofficeController extends Mage_Adminhtml_Cont
|
|
| 205 |
$place = $shippingModel->getTerminal($placeId);
|
| 206 |
if ($place) {
|
| 207 |
$shippingModel->setOfficeToSession($addressId, $place);
|
| 208 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 209 |
return;
|
| 210 |
} else {
|
| 211 |
-
|
|
|
|
| 212 |
return;
|
| 213 |
}
|
| 214 |
}
|
|
@@ -222,7 +237,7 @@ class Eabi_Postoffice_Adminhtml_PostofficeController extends Mage_Adminhtml_Cont
|
|
| 222 |
if ($groupSelectWidth > 0) {
|
| 223 |
$style = ' style="width:'.$groupSelectWidth.'px"';
|
| 224 |
}
|
| 225 |
-
$html .= '<select onclick="return false;" '
|
| 226 |
$html .= '<option value="">';
|
| 227 |
$html .= htmlspecialchars(Mage::helper('eabi_postoffice')->__('-- select --'));
|
| 228 |
$html .= '</option>';
|
|
@@ -252,7 +267,7 @@ class Eabi_Postoffice_Adminhtml_PostofficeController extends Mage_Adminhtml_Cont
|
|
| 252 |
if ($officeSelectWidth > 0) {
|
| 253 |
$style = ' style="width:'.$officeSelectWidth.'px"';
|
| 254 |
}
|
| 255 |
-
$html .= '<select onclick="return false;" '.$style.' name="' . $carrierCode . '_select_office" onchange="var sel = $(this); new Ajax.Request(\'' . $url . '\',{method:\'post\',parameters:{carrier_id:\'' . $carrierId . '\',carrier_code:\'' . $carrierCode . '\',div_id:\'' . $divId . '\',address_id:\'' . $addressId . '\',place_id: sel.getValue()},onSuccess:function(a){ if (a.
|
| 256 |
$html .= '<option value="">';
|
| 257 |
$html .= htmlspecialchars(Mage::helper('eabi_postoffice')->__('-- select --'));
|
| 258 |
$html .= '</option>';
|
|
@@ -292,9 +307,11 @@ class Eabi_Postoffice_Adminhtml_PostofficeController extends Mage_Adminhtml_Cont
|
|
| 292 |
|
| 293 |
|
| 294 |
}
|
|
|
|
| 295 |
|
| 296 |
|
| 297 |
-
|
|
|
|
| 298 |
} else {
|
| 299 |
throw new Exception('Invalid request method');
|
| 300 |
}
|
| 176 |
public function officeAction() {
|
| 177 |
try {
|
| 178 |
if ($this->getRequest()->isPost()) {
|
| 179 |
+
$this->getResponse()->setHeader('Content-type', 'application/json');
|
| 180 |
+
$jsonResponse = array(
|
| 181 |
+
'html' => false,
|
| 182 |
+
'comment' => false,
|
| 183 |
+
);
|
| 184 |
|
| 185 |
$post = $this->getRequest()->getPost();
|
| 186 |
$storeId = (int)$this->getRequest()->getParam('store_id', 0);
|
| 210 |
$place = $shippingModel->getTerminal($placeId);
|
| 211 |
if ($place) {
|
| 212 |
$shippingModel->setOfficeToSession($addressId, $place);
|
| 213 |
+
$jsonResponse['html'] = true;
|
| 214 |
+
$terminalComment = $shippingModel->getTerminalComment($place);
|
| 215 |
+
$isError = $terminalComment->getIsError();
|
| 216 |
+
if ($isError) {
|
| 217 |
+
$jsonResponse['html'] = false;
|
| 218 |
+
$jsonResponse['comment'] = $terminalComment->getComment();
|
| 219 |
+
}
|
| 220 |
+
|
| 221 |
+
// $jsonResponse['comment'] = '<a id="why-to-buy" href="#" onclick="return false;">*<span class="why-to-buy-tooltip">' .$shippingModel->getTerminalComment($place) . '</span></a>';
|
| 222 |
+
$this->getResponse()->setBody(json_encode($jsonResponse));
|
| 223 |
return;
|
| 224 |
} else {
|
| 225 |
+
$jsonResponse['html'] = false;
|
| 226 |
+
$this->getResponse()->setBody(json_encode($jsonResponse));
|
| 227 |
return;
|
| 228 |
}
|
| 229 |
}
|
| 237 |
if ($groupSelectWidth > 0) {
|
| 238 |
$style = ' style="width:'.$groupSelectWidth.'px"';
|
| 239 |
}
|
| 240 |
+
$html .= '<select onclick="return false;" '.$style.' name="' . $carrierCode . '_select_group" onchange="new Ajax.Request(\'' . $url . '\',{method:\'post\',parameters:{carrier_id:\'' . $carrierId . '\',carrier_code:\'' . $carrierCode . '\',div_id:\'' . $divId . '\',address_id:\'' . $addressId . '\',group_id: $(this).getValue()},onSuccess:function(a){$(\'' . $divId . '\').update(a.responseJSON.html)}});">';
|
| 241 |
$html .= '<option value="">';
|
| 242 |
$html .= htmlspecialchars(Mage::helper('eabi_postoffice')->__('-- select --'));
|
| 243 |
$html .= '</option>';
|
| 267 |
if ($officeSelectWidth > 0) {
|
| 268 |
$style = ' style="width:'.$officeSelectWidth.'px"';
|
| 269 |
}
|
| 270 |
+
$html .= '<select onclick="return false;" '.$style.' name="' . $carrierCode . '_select_office" onchange="var sel = $(this); new Ajax.Request(\'' . $url . '\',{method:\'post\',parameters:{carrier_id:\'' . $carrierId . '\',carrier_code:\'' . $carrierCode . '\',div_id:\'' . $divId . '\',address_id:\'' . $addressId . '\',place_id: sel.getValue()},onSuccess:function(a){ if (a.responseJSON.html === true) { if (typeof a.responseJSON.comment === \'string\') { sel.next().update(a.responseJSON.comment); sel.next().removeClassName(\'eabi_postoffice_comment_error\'); sel.next().show(); $$(\'.eabi_carrier\').each(function() { $(this).addClassName(\'over\'); });} else { sel.next().hide(); } $(\'' . $carrierId . '\').writeAttribute(\'value\', \'' . $carrierCode . '_' . $carrierCode . '_\' + sel.getValue()); $(\'' . $carrierId . '\').click(); } else if (a.responseJSON.html === false) { if (typeof a.responseJSON.comment === \'string\') { sel.next().update(a.responseJSON.comment); sel.next().addClassName(\'eabi_postoffice_comment_error\'); sel.next().show(); } else { sel.next().hide(); } } else { sel.next().hide(); }}});">';
|
| 271 |
$html .= '<option value="">';
|
| 272 |
$html .= htmlspecialchars(Mage::helper('eabi_postoffice')->__('-- select --'));
|
| 273 |
$html .= '</option>';
|
| 307 |
|
| 308 |
|
| 309 |
}
|
| 310 |
+
$html .= '<span class="eabi_postoffice_comment" style="display:none;"></span>';
|
| 311 |
|
| 312 |
|
| 313 |
+
$jsonResponse['html'] = $html;
|
| 314 |
+
$this->getResponse()->setBody(json_encode($jsonResponse));
|
| 315 |
} else {
|
| 316 |
throw new Exception('Invalid request method');
|
| 317 |
}
|
app/code/community/Eabi/Postoffice/controllers/IndexController.php
CHANGED
|
@@ -52,6 +52,12 @@ class Eabi_Postoffice_IndexController extends Mage_Core_Controller_Front_Action
|
|
| 52 |
public function officeAction() {
|
| 53 |
try {
|
| 54 |
if ($this->getRequest()->isPost()) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 55 |
$url = Mage::getUrl('eabi_postoffice/index/office', array('_secure' => true));
|
| 56 |
|
| 57 |
$post = $this->getRequest()->getPost();
|
|
@@ -73,10 +79,20 @@ class Eabi_Postoffice_IndexController extends Mage_Core_Controller_Front_Action
|
|
| 73 |
$place = $shippingModel->getTerminal($placeId);
|
| 74 |
if ($place) {
|
| 75 |
$shippingModel->setOfficeToSession($addressId, $place);
|
| 76 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 77 |
return;
|
| 78 |
} else {
|
| 79 |
-
|
|
|
|
| 80 |
return;
|
| 81 |
}
|
| 82 |
}
|
|
@@ -90,7 +106,7 @@ class Eabi_Postoffice_IndexController extends Mage_Core_Controller_Front_Action
|
|
| 90 |
if ($groupSelectWidth > 0) {
|
| 91 |
$style = ' style="width:'.$groupSelectWidth.'px"';
|
| 92 |
}
|
| 93 |
-
$html .= '<select onclick="return false;" '.$style.' name="' . $carrierCode . '_select_group" onchange="new Ajax.Request(\'' . $url . '\',{method:\'post\',parameters:{carrier_id:\'' . $carrierId . '\',carrier_code:\'' . $carrierCode . '\',div_id:\'' . $divId . '\',address_id:\'' . $addressId . '\',group_id: $(this).getValue()},onSuccess:function(a){$(\'' . $divId . '\').update(a.
|
| 94 |
$html .= '<option value="">';
|
| 95 |
$html .= htmlspecialchars(Mage::helper('eabi_postoffice')->__('-- select --'));
|
| 96 |
$html .= '</option>';
|
|
@@ -122,7 +138,7 @@ class Eabi_Postoffice_IndexController extends Mage_Core_Controller_Front_Action
|
|
| 122 |
$style = ' style="width:'.$officeSelectWidth.'px"';
|
| 123 |
}
|
| 124 |
|
| 125 |
-
$html .= '<select onclick="return false;" '.$style.' name="' . $carrierCode . '_select_office" onchange="var sel = $(this); new Ajax.Request(\'' . $url . '\',{method:\'post\',parameters:{carrier_id:\'' . $carrierId . '\',carrier_code:\'' . $carrierCode . '\',div_id:\'' . $divId . '\',address_id:\'' . $addressId . '\',place_id: sel.getValue()},onSuccess:function(a){ if (a.
|
| 126 |
$html .= '<option value="">';
|
| 127 |
$html .= htmlspecialchars(Mage::helper('eabi_postoffice')->__('-- select --'));
|
| 128 |
$html .= '</option>';
|
|
@@ -160,9 +176,11 @@ class Eabi_Postoffice_IndexController extends Mage_Core_Controller_Front_Action
|
|
| 160 |
|
| 161 |
$html .= '</select>';
|
| 162 |
}
|
|
|
|
| 163 |
|
| 164 |
|
| 165 |
-
|
|
|
|
| 166 |
} else {
|
| 167 |
throw new Exception('Invalid request method');
|
| 168 |
}
|
| 52 |
public function officeAction() {
|
| 53 |
try {
|
| 54 |
if ($this->getRequest()->isPost()) {
|
| 55 |
+
$this->getResponse()->setHeader('Content-type', 'application/json');
|
| 56 |
+
$jsonResponse = array(
|
| 57 |
+
'html' => false,
|
| 58 |
+
'comment' => false,
|
| 59 |
+
);
|
| 60 |
+
|
| 61 |
$url = Mage::getUrl('eabi_postoffice/index/office', array('_secure' => true));
|
| 62 |
|
| 63 |
$post = $this->getRequest()->getPost();
|
| 79 |
$place = $shippingModel->getTerminal($placeId);
|
| 80 |
if ($place) {
|
| 81 |
$shippingModel->setOfficeToSession($addressId, $place);
|
| 82 |
+
$jsonResponse['html'] = true;
|
| 83 |
+
$terminalComment = $shippingModel->getTerminalComment($place);
|
| 84 |
+
$isError = $terminalComment->getIsError();
|
| 85 |
+
if ($isError) {
|
| 86 |
+
$jsonResponse['html'] = false;
|
| 87 |
+
}
|
| 88 |
+
|
| 89 |
+
$jsonResponse['comment'] = $terminalComment->getComment();
|
| 90 |
+
// $jsonResponse['comment'] = '<a id="why-to-buy" href="#" onclick="return false;">*<span class="why-to-buy-tooltip">' .$shippingModel->getTerminalComment($place) . '</span></a>';
|
| 91 |
+
$this->getResponse()->setBody(json_encode($jsonResponse));
|
| 92 |
return;
|
| 93 |
} else {
|
| 94 |
+
$jsonResponse['html'] = false;
|
| 95 |
+
$this->getResponse()->setBody(json_encode($jsonResponse));
|
| 96 |
return;
|
| 97 |
}
|
| 98 |
}
|
| 106 |
if ($groupSelectWidth > 0) {
|
| 107 |
$style = ' style="width:'.$groupSelectWidth.'px"';
|
| 108 |
}
|
| 109 |
+
$html .= '<select onclick="return false;" '.$style.' name="' . $carrierCode . '_select_group" onchange="new Ajax.Request(\'' . $url . '\',{method:\'post\',parameters:{carrier_id:\'' . $carrierId . '\',carrier_code:\'' . $carrierCode . '\',div_id:\'' . $divId . '\',address_id:\'' . $addressId . '\',group_id: $(this).getValue()},onSuccess:function(a){$(\'' . $divId . '\').update(a.responseJSON.html)}});">';
|
| 110 |
$html .= '<option value="">';
|
| 111 |
$html .= htmlspecialchars(Mage::helper('eabi_postoffice')->__('-- select --'));
|
| 112 |
$html .= '</option>';
|
| 138 |
$style = ' style="width:'.$officeSelectWidth.'px"';
|
| 139 |
}
|
| 140 |
|
| 141 |
+
$html .= '<select onclick="return false;" '.$style.' name="' . $carrierCode . '_select_office" onchange="var sel = $(this); new Ajax.Request(\'' . $url . '\',{method:\'post\',parameters:{carrier_id:\'' . $carrierId . '\',carrier_code:\'' . $carrierCode . '\',div_id:\'' . $divId . '\',address_id:\'' . $addressId . '\',place_id: sel.getValue()},onSuccess:function(a){ if (a.responseJSON.html === true) { if (typeof a.responseJSON.comment === \'string\') { sel.next().update(a.responseJSON.comment); sel.next().removeClassName(\'eabi_postoffice_comment_error\'); sel.next().show(); $(\'' . $divId. '\').addClassName(\'over\'); setTimeout(function() {$(\'' . $divId. '\').removeClassName(\'over\');}, 1500);} else { sel.next().hide(); } $(\'' . $carrierId . '\').writeAttribute(\'value\', \'' . $carrierCode . '_' . $carrierCode . '_\' + sel.getValue()); $(\'' . $carrierId . '\').click(); } else if (a.responseJSON.html === false) { if (typeof a.responseJSON.comment === \'string\') { sel.next().update(a.responseJSON.comment); sel.next().addClassName(\'eabi_postoffice_comment_error\'); sel.next().show(); $(\'' . $divId. '\').addClassName(\'over\'); setTimeout(function() {$(\'' . $divId. '\').removeClassName(\'over\');}, 1500); } else { sel.next().hide(); } } else { sel.next().hide(); }}});">';
|
| 142 |
$html .= '<option value="">';
|
| 143 |
$html .= htmlspecialchars(Mage::helper('eabi_postoffice')->__('-- select --'));
|
| 144 |
$html .= '</option>';
|
| 176 |
|
| 177 |
$html .= '</select>';
|
| 178 |
}
|
| 179 |
+
$html .= '<span class="eabi_postoffice_comment" style="display:none;"></span>';
|
| 180 |
|
| 181 |
|
| 182 |
+
$jsonResponse['html'] = $html;
|
| 183 |
+
$this->getResponse()->setBody(json_encode($jsonResponse));
|
| 184 |
} else {
|
| 185 |
throw new Exception('Invalid request method');
|
| 186 |
}
|
app/code/community/Eabi/Postoffice/etc/config.xml
CHANGED
|
@@ -36,7 +36,7 @@
|
|
| 36 |
<config>
|
| 37 |
<modules>
|
| 38 |
<Eabi_Postoffice>
|
| 39 |
-
<version>0.1.
|
| 40 |
</Eabi_Postoffice>
|
| 41 |
</modules>
|
| 42 |
|
| 36 |
<config>
|
| 37 |
<modules>
|
| 38 |
<Eabi_Postoffice>
|
| 39 |
+
<version>0.1.8</version>
|
| 40 |
</Eabi_Postoffice>
|
| 41 |
</modules>
|
| 42 |
|
app/design/adminhtml/default/default/layout/eabi_postoffice.xml
CHANGED
|
@@ -77,12 +77,12 @@
|
|
| 77 |
</reference>
|
| 78 |
</reference>
|
| 79 |
</adminhtml_sales_order_create_load_block_data>
|
| 80 |
-
<
|
| 81 |
<reference name="head">
|
| 82 |
<action method="addCss">
|
| 83 |
<name>eabi_postoffice.css</name>
|
| 84 |
</action>
|
| 85 |
</reference>
|
| 86 |
-
</
|
| 87 |
|
| 88 |
</layout>
|
| 77 |
</reference>
|
| 78 |
</reference>
|
| 79 |
</adminhtml_sales_order_create_load_block_data>
|
| 80 |
+
<default>
|
| 81 |
<reference name="head">
|
| 82 |
<action method="addCss">
|
| 83 |
<name>eabi_postoffice.css</name>
|
| 84 |
</action>
|
| 85 |
</reference>
|
| 86 |
+
</default>
|
| 87 |
|
| 88 |
</layout>
|
app/design/frontend/base/default/layout/eabi_postoffice.xml
CHANGED
|
@@ -74,6 +74,13 @@
|
|
| 74 |
</reference>
|
| 75 |
|
| 76 |
</shipping_tracking_popup>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 77 |
|
| 78 |
|
| 79 |
</layout>
|
| 74 |
</reference>
|
| 75 |
|
| 76 |
</shipping_tracking_popup>
|
| 77 |
+
<default>
|
| 78 |
+
<reference name="head">
|
| 79 |
+
<action method="addCss">
|
| 80 |
+
<name>css/eabi_postoffice.css</name>
|
| 81 |
+
</action>
|
| 82 |
+
</reference>
|
| 83 |
+
</default>
|
| 84 |
|
| 85 |
|
| 86 |
</layout>
|
app/etc/modules/Eabi_DpdEE.xml
CHANGED
|
@@ -39,7 +39,7 @@
|
|
| 39 |
<depends>
|
| 40 |
<Eabi_Postoffice />
|
| 41 |
</depends>
|
| 42 |
-
<version>0.1.
|
| 43 |
</Eabi_DpdEE>
|
| 44 |
</modules>
|
| 45 |
</config>
|
| 39 |
<depends>
|
| 40 |
<Eabi_Postoffice />
|
| 41 |
</depends>
|
| 42 |
+
<version>0.1.12</version>
|
| 43 |
</Eabi_DpdEE>
|
| 44 |
</modules>
|
| 45 |
</config>
|
app/etc/modules/Eabi_Postoffice.xml
CHANGED
|
@@ -42,7 +42,7 @@
|
|
| 42 |
<Mage_Shipping />
|
| 43 |
<Eabi_Livehandler />
|
| 44 |
</depends>
|
| 45 |
-
<version>0.1.
|
| 46 |
</Eabi_Postoffice>
|
| 47 |
</modules>
|
| 48 |
</config>
|
| 42 |
<Mage_Shipping />
|
| 43 |
<Eabi_Livehandler />
|
| 44 |
</depends>
|
| 45 |
+
<version>0.1.8</version>
|
| 46 |
</Eabi_Postoffice>
|
| 47 |
</modules>
|
| 48 |
</config>
|
app/locale/en_US/Eabi_Postoffice.csv
CHANGED
|
@@ -49,3 +49,10 @@
|
|
| 49 |
"Register license","Register license"
|
| 50 |
"Please select pickup point for %s","Please select pickup point for %s"
|
| 51 |
"Barcode: %s","Barcode: %s"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 49 |
"Register license","Register license"
|
| 50 |
"Please select pickup point for %s","Please select pickup point for %s"
|
| 51 |
"Barcode: %s","Barcode: %s"
|
| 52 |
+
"Delivery on %s","Delivery on %s"
|
| 53 |
+
"Delivery on %1$s by %2$s","Delivery on %1$s by %2$s"
|
| 54 |
+
"today","today"
|
| 55 |
+
"tomorrow","tomorrow"
|
| 56 |
+
"day after tomorrow","day after tomorrow"
|
| 57 |
+
"Send order confirmation with barcode to following e-mails after parcel data send success","Send order confirmation with barcode to following e-mails after parcel data send success"
|
| 58 |
+
|
app/locale/et_EE/Eabi_Postoffice.csv
CHANGED
|
@@ -49,3 +49,9 @@
|
|
| 49 |
"Register license","Registreeri litsents"
|
| 50 |
"Please select pickup point for %s","Palun vali korjepunkt tarneviisile %s"
|
| 51 |
"Barcode: %s","Ribakood: %s"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 49 |
"Register license","Registreeri litsents"
|
| 50 |
"Please select pickup point for %s","Palun vali korjepunkt tarneviisile %s"
|
| 51 |
"Barcode: %s","Ribakood: %s"
|
| 52 |
+
"Delivery on %s","Pakk kohal %s"
|
| 53 |
+
"Delivery on %1$s by %2$s","Pakk kohal %1$s kell %2$s"
|
| 54 |
+
"today","täna"
|
| 55 |
+
"tomorrow","homme"
|
| 56 |
+
"day after tomorrow","ülehomme"
|
| 57 |
+
"Send order confirmation with barcode to following e-mails after parcel data send success","Saada tellimuse kinnitus ribakoodiga järgnevatele e-posti aadressidele peale edukat pakiandmete saatmist"
|
app/locale/fi_FI/Eabi_Postoffice.csv
CHANGED
|
@@ -49,3 +49,9 @@
|
|
| 49 |
"Register license","Register license"
|
| 50 |
"Please select pickup point for %s","Please select pickup point for %s"
|
| 51 |
"Barcode: %s","Barcode: %s"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 49 |
"Register license","Register license"
|
| 50 |
"Please select pickup point for %s","Please select pickup point for %s"
|
| 51 |
"Barcode: %s","Barcode: %s"
|
| 52 |
+
"Delivery on %s","Delivery on %s"
|
| 53 |
+
"Delivery on %1$s by %2$s","Delivery on %1$s by %2$s"
|
| 54 |
+
"today","today"
|
| 55 |
+
"tomorrow","tomorrow"
|
| 56 |
+
"day after tomorrow","day after tomorrow"
|
| 57 |
+
"Send order confirmation with barcode to following e-mails after parcel data send success","Send order confirmation with barcode to following e-mails after parcel data send success"
|
app/locale/hu_HU/Eabi_Postoffice.csv
CHANGED
|
@@ -49,3 +49,9 @@
|
|
| 49 |
"Register license","Register license"
|
| 50 |
"Please select pickup point for %s","Please select pickup point for %s"
|
| 51 |
"Barcode: %s","Barcode: %s"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 49 |
"Register license","Register license"
|
| 50 |
"Please select pickup point for %s","Please select pickup point for %s"
|
| 51 |
"Barcode: %s","Barcode: %s"
|
| 52 |
+
"Delivery on %s","Delivery on %s"
|
| 53 |
+
"Delivery on %1$s by %2$s","Delivery on %1$s by %2$s"
|
| 54 |
+
"today","today"
|
| 55 |
+
"tomorrow","tomorrow"
|
| 56 |
+
"day after tomorrow","day after tomorrow"
|
| 57 |
+
"Send order confirmation with barcode to following e-mails after parcel data send success","Send order confirmation with barcode to following e-mails after parcel data send success"
|
app/locale/lt_LT/Eabi_Postoffice.csv
CHANGED
|
@@ -49,3 +49,9 @@
|
|
| 49 |
"Register license","Register license"
|
| 50 |
"Please select pickup point for %s","Please select pickup point for %s"
|
| 51 |
"Barcode: %s","Barcode: %s"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 49 |
"Register license","Register license"
|
| 50 |
"Please select pickup point for %s","Please select pickup point for %s"
|
| 51 |
"Barcode: %s","Barcode: %s"
|
| 52 |
+
"Delivery on %s","Delivery on %s"
|
| 53 |
+
"Delivery on %1$s by %2$s","Delivery on %1$s by %2$s"
|
| 54 |
+
"today","today"
|
| 55 |
+
"tomorrow","tomorrow"
|
| 56 |
+
"day after tomorrow","day after tomorrow"
|
| 57 |
+
"Send order confirmation with barcode to following e-mails after parcel data send success","Send order confirmation with barcode to following e-mails after parcel data send success"
|
app/locale/ru_RU/Eabi_Postoffice.csv
CHANGED
|
@@ -49,3 +49,9 @@
|
|
| 49 |
"Register license","Register license"
|
| 50 |
"Please select pickup point for %s","Please select pickup point for %s"
|
| 51 |
"Barcode: %s","Barcode: %s"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 49 |
"Register license","Register license"
|
| 50 |
"Please select pickup point for %s","Please select pickup point for %s"
|
| 51 |
"Barcode: %s","Barcode: %s"
|
| 52 |
+
"Delivery on %s","Delivery on %s"
|
| 53 |
+
"Delivery on %1$s by %2$s","Delivery on %1$s by %2$s"
|
| 54 |
+
"today","today"
|
| 55 |
+
"tomorrow","tomorrow"
|
| 56 |
+
"day after tomorrow","day after tomorrow"
|
| 57 |
+
"Send order confirmation with barcode to following e-mails after parcel data send success","Send order confirmation with barcode to following e-mails after parcel data send success"
|
app/locale/sv_SE/Eabi_Postoffice.csv
CHANGED
|
@@ -55,3 +55,9 @@
|
|
| 55 |
"Register license","Register license"
|
| 56 |
"Please select pickup point for %s","Please select pickup point for %s"
|
| 57 |
"Barcode: %s","Barcode: %s"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 55 |
"Register license","Register license"
|
| 56 |
"Please select pickup point for %s","Please select pickup point for %s"
|
| 57 |
"Barcode: %s","Barcode: %s"
|
| 58 |
+
"Delivery on %s","Delivery on %s"
|
| 59 |
+
"Delivery on %1$s by %2$s","Delivery on %1$s by %2$s"
|
| 60 |
+
"today","today"
|
| 61 |
+
"tomorrow","tomorrow"
|
| 62 |
+
"day after tomorrow","day after tomorrow"
|
| 63 |
+
"Send order confirmation with barcode to following e-mails after parcel data send success","Send order confirmation with barcode to following e-mails after parcel data send success"
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Eabi_DpdEE</name>
|
| 4 |
-
<version>0.1.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.gnu.org/licenses/gpl-3.0.txt">GNU Public License V3.0</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -17,13 +17,11 @@
|
|
| 17 |
<p>Allows to call the courier from Magento admin</p>
|
| 18 |
<p>Allows cash on delivery payment and allows to set an extra fee per country which will be appended to shipping fee</p>
|
| 19 |
<p>Intended to use for Estonian merchant who sends parcels to all Baltic states</p></description>
|
| 20 |
-
<notes>-
|
| 21 |
-
- Added event listener before checkout commit to throw exception when parcel terminal is not selected
|
| 22 |
-
- Added event listener for sending out e-mail on data send success and fetching email from corresponding shipping method model</notes>
|
| 23 |
<authors><author><name>Matis Matis</name><user>auto-converted</user><email>info@e-abi.ee</email></author></authors>
|
| 24 |
-
<date>
|
| 25 |
-
<time>
|
| 26 |
-
<contents><target name="magecommunity"><dir name="Eabi"><dir name="DpdEE"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Country.php" hash="eea442b65d8f6a096e91c3087aa7a1d8"/></dir></dir></dir></dir><dir name="Info"><file name="Payment.php" hash="b2fee225c6e1d5df02cf39b46aa0f8b2"/></dir><dir name="Order"><file name="Courier.php" hash="190bec01b67a7c3da0b08d6ec44315e4"/></dir><file name="Invoice.php" hash="4b66c452996bfe08f5ff3f0cac346ab1"/></dir><dir name="Helper"><file name="Data.php" hash="e309fa33bbd4eb0d0b607b9428313837"/></dir><dir name="Model"><dir name="Action"><dir name="Carrier"><dir name="Order"><file name="Courier.php" hash="a7188340758f43b53302cd0146467daf"/></dir></dir></dir><dir name="Button"><file name="Courier.php" hash="e18911389141943fb0aa02de7c14574b"/></dir><dir name="Payment"><file name="Processor.php" hash="0cd6e6138c88069b36eae2e37e8e73ff"/></dir><dir name="Source"><dir name="Label"><file name="Position.php" hash="92238059519dcdec87401ef8cafe3fe7"/></dir><file name="Service.php" hash="3f61777107806dd84e360c3d0867b2bb"/></dir><file name="Api.php" hash="083c3534789282ca18e377247fd35bd9"/><file name="Config.php" hash="9adeafdbd2cf7a15128f2ff9b5dacdee"/><file name="Flat.php" hash="77975d48ae295ae15e0b6bc49319856e"/><file name="Observer.php" hash="2c1b22592eb9d7361fe2f42545f75b63"/><file name="Post.php" hash="d41eb1d814e47cd0e78cf0b1b489be99"/></dir><dir name="etc"><file name="config.xml" hash="
|
| 27 |
<compatible/>
|
| 28 |
<dependencies><required><package><name>Eabi_Livehandler</name><channel>community</channel><min>0.1.9</min><max>1.0.0</max></package></required></dependencies>
|
| 29 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Eabi_DpdEE</name>
|
| 4 |
+
<version>0.1.12</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.gnu.org/licenses/gpl-3.0.txt">GNU Public License V3.0</license>
|
| 7 |
<channel>community</channel>
|
| 17 |
<p>Allows to call the courier from Magento admin</p>
|
| 18 |
<p>Allows cash on delivery payment and allows to set an extra fee per country which will be appended to shipping fee</p>
|
| 19 |
<p>Intended to use for Estonian merchant who sends parcels to all Baltic states</p></description>
|
| 20 |
+
<notes>- Added various improvements to Eabi_Postoffice package, required to update only if you are using modules, which depend on those updates</notes>
|
|
|
|
|
|
|
| 21 |
<authors><author><name>Matis Matis</name><user>auto-converted</user><email>info@e-abi.ee</email></author></authors>
|
| 22 |
+
<date>2015-01-06</date>
|
| 23 |
+
<time>02:44:07</time>
|
| 24 |
+
<contents><target name="magecommunity"><dir name="Eabi"><dir name="DpdEE"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Country.php" hash="eea442b65d8f6a096e91c3087aa7a1d8"/></dir></dir></dir></dir><dir name="Info"><file name="Payment.php" hash="b2fee225c6e1d5df02cf39b46aa0f8b2"/></dir><dir name="Order"><file name="Courier.php" hash="190bec01b67a7c3da0b08d6ec44315e4"/></dir><file name="Invoice.php" hash="4b66c452996bfe08f5ff3f0cac346ab1"/></dir><dir name="Helper"><file name="Data.php" hash="e309fa33bbd4eb0d0b607b9428313837"/></dir><dir name="Model"><dir name="Action"><dir name="Carrier"><dir name="Order"><file name="Courier.php" hash="a7188340758f43b53302cd0146467daf"/></dir></dir></dir><dir name="Button"><file name="Courier.php" hash="e18911389141943fb0aa02de7c14574b"/></dir><dir name="Payment"><file name="Processor.php" hash="0cd6e6138c88069b36eae2e37e8e73ff"/></dir><dir name="Source"><dir name="Label"><file name="Position.php" hash="92238059519dcdec87401ef8cafe3fe7"/></dir><file name="Service.php" hash="3f61777107806dd84e360c3d0867b2bb"/></dir><file name="Api.php" hash="083c3534789282ca18e377247fd35bd9"/><file name="Config.php" hash="9adeafdbd2cf7a15128f2ff9b5dacdee"/><file name="Flat.php" hash="77975d48ae295ae15e0b6bc49319856e"/><file name="Observer.php" hash="2c1b22592eb9d7361fe2f42545f75b63"/><file name="Post.php" hash="d41eb1d814e47cd0e78cf0b1b489be99"/></dir><dir name="etc"><file name="config.xml" hash="b3cf572f1f5a6645a165d1bd48937b8e"/><file name="system.xml" hash="9277288e489beaec4cd2170f034ec8a6"/></dir><dir name="sql"><dir name="eabi_dpdee_setup"><file name="mysql4-install-0.1.0.php" hash="9899be85206a5ab3a36cf9acf176f1ba"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="867f9921932996c3a0f77fa9bb2fdb04"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="182c47a3d5fab4a466a07ef996dfe4d1"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="6a7ef422fd05c87c0c7b29557cd064ae"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="3c20db4f5d9de485f51b4cb28ca9eb87"/><file name="mysql4-upgrade-0.1.6-0.1.7.php" hash="d54424c11c48db64ed514ced1df4d60c"/><file name="mysql4-upgrade-0.1.9-0.1.10.php" hash="52c70756d6542e054699d922f752e123"/></dir></dir><file name="CHANGELOG.txt" hash="bad4a8cf61f480550bf4f14f6914392e"/><file name="LICENCE.txt" hash="0191312e121c0b3e1165619b96efcf9f"/></dir><dir name="Postoffice"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="License.php" hash="5d3e88fcea3dc7352254910c60d43cc8"/><file name="Remove.php" hash="11818c816c7e37c0f37e8732d02d7711"/></dir></dir></dir></dir><dir name="Config"><file name="Rebuildbutton.php" hash="b54ac12fa93514f5fd772e4512be945e"/></dir></dir><dir name="Helper"><file name="Countrycode.php" hash="11b598e6008f18baa7dafc3b579c6c96"/><file name="Data.php" hash="5aacd52d6c3066b54efe5cbfdb1b21fb"/></dir><dir name="Model"><dir name="Carrier"><file name="Abstract.php" hash="fa1921a37bfe61849b9a59f9f141a5dc"/><file name="Result.php" hash="452b5250a1eeaa2647106d896f170f0e"/></dir><dir name="Mysql4"><dir name="Carriermodule"><file name="Collection.php" hash="8ccfde755a7ef4d3eecb09144919ae9a"/></dir><dir name="Office"><file name="Collection.php" hash="26894ab3a3079edf21a722b46d495d07"/></dir><file name="Carriermodule.php" hash="06fb7663d449a1a559e482807e8a8e9e"/><file name="Office.php" hash="f1ab374d9041692dabd1a1c569bc5065"/></dir><dir name="Source"><file name="Sendevent.php" hash="4d0a215ab10eb52c4de46a66155899b8"/></dir><file name="Carriermodule.php" hash="cc4ad05756dc8f8fbb66e5a3561d61ea"/><file name="Observer.php" hash="5c4c236b268c5929e5d1a844a0eb9f6c"/><file name="Office.php" hash="6f3829a91a2d3c474f0127de8e8279da"/><file name="Orderview.php" hash="9654a4b6c60f3c9d07930b56957f22f7"/><file name="Updater.php" hash="1bd7d37a9a2e814e85a14b3c669ef4ba"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="PostofficeController.php" hash="b837fb1ef3e17f1d7f49c1c8ef516e67"/></dir><file name="IndexController.php" hash="f287fec34c6d0422287da972634f40bb"/></dir><dir name="etc"><file name="config.xml" hash="84f2ab91bdef934f29d61a385eb597d0"/></dir><dir name="sql"><dir name="eabi_postoffice_setup"><file name="mysql4-install-0.1.0.php" hash="6c8c1a726bbebeaa707b007bdff592d9"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="641d3015c6f3b761759a882ed8fea5c2"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="c61dcac734cc0be364afe3262a710729"/><file name="mysql4-upgrade-0.1.5-0.1.6.php" hash="2a71344a96b5b5ef191956443fa2eadb"/><file name="mysql4-upgrade-0.1.6-0.1.7.php" hash="d8e6cf582360e0fa6141f802d97e9606"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="eabi_dpdee.xml" hash="85311cb850eb13eadaed47cdc9c44fb3"/><file name="eabi_postoffice.xml" hash="46fd01fc2eb9d53c0e7a0422e4df6557"/></dir><dir name="template"><dir name="eabi_dpdee"><dir name="order"><file name="courier.phtml" hash="0310f24e96ca3873e78e0e2a0ab26743"/></dir><file name="payment_info.phtml" hash="3f8a01e4bcd2efab555d729bee8335da"/></dir><dir name="eabi_postoffice"><file name="shipping_method_form.phtml" hash="542898a02261b0bccf075424fd0b4903"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="eabi_dpdee.xml" hash="27179eee219a0a8c85b87b8d670ae9e1"/><file name="eabi_postoffice.xml" hash="09c7179fbf39ea891fa35264e4eb8360"/></dir><dir name="template"><dir name="eabi_dpdee"><file name="payment_info.phtml" hash="3f8a01e4bcd2efab555d729bee8335da"/></dir><dir name="eabi_postoffice"><dir name="tracking"><file name="popup.phtml" hash="c6d8cc592aaa7bee1ec20dc1c202d841"/></dir><file name="available.phtml" hash="0afb1521ac8c2ab4c80364dd3cef051a"/><file name="multishipping.phtml" hash="f27c3d8ac939a97ab160feef8f5370d1"/><file name="shipping.phtml" hash="b041efafbcbbea2f2b4a6584cba83e2f"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Eabi_Postoffice.xml" hash="48e85ab626ffb18ff5afa36ae679588e"/><file name="Eabi_DpdEE.xml" hash="920e4d3a32dba9042ffa50eba0f826d6"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Eabi_DpdEE.csv" hash="d98963cb668ca0c0174b1503c1eb0a34"/><file name="Eabi_Postoffice.csv" hash="ebe39d7d5df2083aded7a85be7d237e8"/></dir><dir name="et_EE"><file name="Eabi_DpdEE.csv" hash="fe3c32249528cfb77519cff7e90ffb33"/><file name="Eabi_Postoffice.csv" hash="0cb3f5bcc2f07e0a11152f5e51620063"/></dir><dir name="ru_RU"><file name="Eabi_DpdEE.csv" hash="bb76f70e2c91160b11f570651ee0b8ee"/><file name="Eabi_Postoffice.csv" hash="fb913aabfe19bb95b89bcbdb878e715c"/></dir><dir name="hu_HU"><file name="Eabi_Postoffice.csv" hash="fb913aabfe19bb95b89bcbdb878e715c"/></dir><dir name="fi_FI"><file name="Eabi_Postoffice.csv" hash="fb913aabfe19bb95b89bcbdb878e715c"/></dir><dir name="lt_LT"><file name="Eabi_Postoffice.csv" hash="fb913aabfe19bb95b89bcbdb878e715c"/></dir><dir name="sv_SE"><file name="Eabi_Postoffice.csv" hash="88e407afb5e2a957aeb1cbe525e593f9"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><file name="eabi_dpdee.css" hash="fc08519f26a3b0819b4c925bd2f1ef1a"/><file name="eabi_postoffice.css" hash="e3f33b57efde22b9543384b57c994255"/></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="eabi_postoffice.css" hash="23ee780980d733a66a575a55954dd4a6"/></dir></dir></dir><dir name="default"><dir name="default"><dir name="css"><file name="eabi_postoffice.css" hash="23ee780980d733a66a575a55954dd4a6"/></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="eabi_js"><file name="eabi_dpdee.js" hash="1339c149edea070f9908ceb2e7bf559d"/></dir></dir></target></contents>
|
| 25 |
<compatible/>
|
| 26 |
<dependencies><required><package><name>Eabi_Livehandler</name><channel>community</channel><min>0.1.9</min><max>1.0.0</max></package></required></dependencies>
|
| 27 |
</package>
|
skin/adminhtml/default/default/eabi_postoffice.css
ADDED
|
@@ -0,0 +1,121 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
/*
|
| 2 |
+
|
| 3 |
+
*
|
| 4 |
+
* NOTICE OF LICENSE
|
| 5 |
+
*
|
| 6 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
| 7 |
+
* or OpenGPL v3 license (GNU Public License V3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
| 11 |
+
* or
|
| 12 |
+
* http://www.gnu.org/licenses/gpl-3.0.txt
|
| 13 |
+
* If you did not receive a copy of the license and are unable to
|
| 14 |
+
* obtain it through the world-wide-web, please send an email
|
| 15 |
+
* to info@e-abi.ee so we can send you a copy immediately.
|
| 16 |
+
*
|
| 17 |
+
* DISCLAIMER
|
| 18 |
+
*
|
| 19 |
+
* Do not edit or add to this file if you wish to upgrade this module to newer
|
| 20 |
+
* versions in the future.
|
| 21 |
+
*
|
| 22 |
+
* @category Eabi
|
| 23 |
+
* @package Eabi_Dpd
|
| 24 |
+
* @copyright Copyright (c) 2014 Aktsiamaailm LLC (http://en.e-abi.ee/)
|
| 25 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 26 |
+
* @license http://www.gnu.org/licenses/gpl-3.0.txt GNU Public License V3.0
|
| 27 |
+
* @author Matis Halmann
|
| 28 |
+
*
|
| 29 |
+
|
| 30 |
+
*/
|
| 31 |
+
|
| 32 |
+
.eabi_postoffice_license {
|
| 33 |
+
list-style: none outside none;
|
| 34 |
+
border: 1px solid #dadfe0;
|
| 35 |
+
}
|
| 36 |
+
|
| 37 |
+
|
| 38 |
+
.eabi_postoffice_license li {
|
| 39 |
+
font-size: 0.95em !important;
|
| 40 |
+
font-weight: bold !important;
|
| 41 |
+
margin-bottom: 0px !important;
|
| 42 |
+
padding: 0px 0px 0px 32px !important;
|
| 43 |
+
width: 350px;
|
| 44 |
+
}
|
| 45 |
+
|
| 46 |
+
.eabi_postoffice_license li strong {
|
| 47 |
+
width: 150px;
|
| 48 |
+
float: left;
|
| 49 |
+
}
|
| 50 |
+
|
| 51 |
+
|
| 52 |
+
.eabi_postoffice_license li span {
|
| 53 |
+
width: 200px;
|
| 54 |
+
float: right;
|
| 55 |
+
}
|
| 56 |
+
|
| 57 |
+
.eabi_postoffice_license li span.no-license {
|
| 58 |
+
background: #faebe7;
|
| 59 |
+
color: #df280a;
|
| 60 |
+
}
|
| 61 |
+
|
| 62 |
+
.eabi_postoffice_license li span.countries {
|
| 63 |
+
background: #eff5ea;
|
| 64 |
+
color: #3d6611;
|
| 65 |
+
}
|
| 66 |
+
|
| 67 |
+
.eabi_carrier
|
| 68 |
+
{
|
| 69 |
+
outline: none;
|
| 70 |
+
}
|
| 71 |
+
.eabi_carrier strong
|
| 72 |
+
{
|
| 73 |
+
line-height: 30px;
|
| 74 |
+
}
|
| 75 |
+
.eabi_carrier.over,
|
| 76 |
+
.eabi_carrier:hover
|
| 77 |
+
{
|
| 78 |
+
text-decoration: none;
|
| 79 |
+
}
|
| 80 |
+
.eabi_carrier .eabi_postoffice_comment
|
| 81 |
+
{
|
| 82 |
+
display: none;
|
| 83 |
+
line-height: 16px;
|
| 84 |
+
margin-left: 28px;
|
| 85 |
+
margin-top: -30px;
|
| 86 |
+
padding: 14px 20px;
|
| 87 |
+
width: 300px;
|
| 88 |
+
z-index: 10;
|
| 89 |
+
}
|
| 90 |
+
|
| 91 |
+
|
| 92 |
+
.eabi_carrier.over .eabi_postoffice_comment,
|
| 93 |
+
.eabi_carrier:hover .eabi_postoffice_comment
|
| 94 |
+
{
|
| 95 |
+
background: #eff5ea;
|
| 96 |
+
border: 1px solid #95a486;
|
| 97 |
+
color: #3d6611;
|
| 98 |
+
display: inline;
|
| 99 |
+
position: absolute;
|
| 100 |
+
}
|
| 101 |
+
.callout
|
| 102 |
+
{
|
| 103 |
+
border: 0;
|
| 104 |
+
left: -12px;
|
| 105 |
+
position: absolute;
|
| 106 |
+
top: 30px;
|
| 107 |
+
z-index: 20;
|
| 108 |
+
}
|
| 109 |
+
.eabi_carrier .eabi_postoffice_comment
|
| 110 |
+
{
|
| 111 |
+
border-radius: 4px;
|
| 112 |
+
box-shadow: 5px 5px 8px #CCC;
|
| 113 |
+
}
|
| 114 |
+
|
| 115 |
+
.eabi_carrier.over .eabi_postoffice_comment_error,
|
| 116 |
+
.eabi_carrier:hover .eabi_postoffice_comment_error {
|
| 117 |
+
background: #faebe7;
|
| 118 |
+
color: #df280a;
|
| 119 |
+
border-color: #f16048;
|
| 120 |
+
|
| 121 |
+
}
|
skin/frontend/base/default/css/eabi_postoffice.css
ADDED
|
@@ -0,0 +1,89 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
/*
|
| 2 |
+
|
| 3 |
+
*
|
| 4 |
+
* NOTICE OF LICENSE
|
| 5 |
+
*
|
| 6 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
| 7 |
+
* or OpenGPL v3 license (GNU Public License V3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
| 11 |
+
* or
|
| 12 |
+
* http://www.gnu.org/licenses/gpl-3.0.txt
|
| 13 |
+
* If you did not receive a copy of the license and are unable to
|
| 14 |
+
* obtain it through the world-wide-web, please send an email
|
| 15 |
+
* to info@e-abi.ee so we can send you a copy immediately.
|
| 16 |
+
*
|
| 17 |
+
* DISCLAIMER
|
| 18 |
+
*
|
| 19 |
+
* Do not edit or add to this file if you wish to upgrade this module to newer
|
| 20 |
+
* versions in the future.
|
| 21 |
+
*
|
| 22 |
+
* @category Eabi
|
| 23 |
+
* @package Eabi_Dpd
|
| 24 |
+
* @copyright Copyright (c) 2014 Aktsiamaailm LLC (http://en.e-abi.ee/)
|
| 25 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 26 |
+
* @license http://www.gnu.org/licenses/gpl-3.0.txt GNU Public License V3.0
|
| 27 |
+
* @author Matis Halmann
|
| 28 |
+
*
|
| 29 |
+
|
| 30 |
+
*/
|
| 31 |
+
/*
|
| 32 |
+
Created on : Dec 29, 2014, 12:23:35 AM
|
| 33 |
+
Author : Matis
|
| 34 |
+
*/
|
| 35 |
+
.eabi_carrier
|
| 36 |
+
{
|
| 37 |
+
outline: none;
|
| 38 |
+
}
|
| 39 |
+
.eabi_carrier strong
|
| 40 |
+
{
|
| 41 |
+
line-height: 30px;
|
| 42 |
+
}
|
| 43 |
+
.eabi_carrier.over,
|
| 44 |
+
.eabi_carrier:hover
|
| 45 |
+
{
|
| 46 |
+
text-decoration: none;
|
| 47 |
+
}
|
| 48 |
+
.eabi_carrier .eabi_postoffice_comment
|
| 49 |
+
{
|
| 50 |
+
display: none;
|
| 51 |
+
line-height: 16px;
|
| 52 |
+
margin-left: 28px;
|
| 53 |
+
margin-top: -30px;
|
| 54 |
+
padding: 14px 20px;
|
| 55 |
+
width: 300px;
|
| 56 |
+
z-index: 10;
|
| 57 |
+
}
|
| 58 |
+
|
| 59 |
+
|
| 60 |
+
.eabi_carrier.over .eabi_postoffice_comment,
|
| 61 |
+
.eabi_carrier:hover .eabi_postoffice_comment
|
| 62 |
+
{
|
| 63 |
+
background: #eff5ea;
|
| 64 |
+
border: 1px solid #95a486;
|
| 65 |
+
color: #3d6611;
|
| 66 |
+
display: inline;
|
| 67 |
+
position: absolute;
|
| 68 |
+
}
|
| 69 |
+
.callout
|
| 70 |
+
{
|
| 71 |
+
border: 0;
|
| 72 |
+
left: -12px;
|
| 73 |
+
position: absolute;
|
| 74 |
+
top: 30px;
|
| 75 |
+
z-index: 20;
|
| 76 |
+
}
|
| 77 |
+
.eabi_carrier .eabi_postoffice_comment
|
| 78 |
+
{
|
| 79 |
+
border-radius: 4px;
|
| 80 |
+
box-shadow: 5px 5px 8px #CCC;
|
| 81 |
+
}
|
| 82 |
+
|
| 83 |
+
.eabi_carrier.over .eabi_postoffice_comment_error,
|
| 84 |
+
.eabi_carrier:hover .eabi_postoffice_comment_error {
|
| 85 |
+
background: #faebe7;
|
| 86 |
+
color: #df280a;
|
| 87 |
+
border-color: #f16048;
|
| 88 |
+
|
| 89 |
+
}
|
skin/frontend/default/default/css/eabi_postoffice.css
ADDED
|
@@ -0,0 +1,89 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
/*
|
| 2 |
+
|
| 3 |
+
*
|
| 4 |
+
* NOTICE OF LICENSE
|
| 5 |
+
*
|
| 6 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
| 7 |
+
* or OpenGPL v3 license (GNU Public License V3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
| 11 |
+
* or
|
| 12 |
+
* http://www.gnu.org/licenses/gpl-3.0.txt
|
| 13 |
+
* If you did not receive a copy of the license and are unable to
|
| 14 |
+
* obtain it through the world-wide-web, please send an email
|
| 15 |
+
* to info@e-abi.ee so we can send you a copy immediately.
|
| 16 |
+
*
|
| 17 |
+
* DISCLAIMER
|
| 18 |
+
*
|
| 19 |
+
* Do not edit or add to this file if you wish to upgrade this module to newer
|
| 20 |
+
* versions in the future.
|
| 21 |
+
*
|
| 22 |
+
* @category Eabi
|
| 23 |
+
* @package Eabi_Dpd
|
| 24 |
+
* @copyright Copyright (c) 2014 Aktsiamaailm LLC (http://en.e-abi.ee/)
|
| 25 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 26 |
+
* @license http://www.gnu.org/licenses/gpl-3.0.txt GNU Public License V3.0
|
| 27 |
+
* @author Matis Halmann
|
| 28 |
+
*
|
| 29 |
+
|
| 30 |
+
*/
|
| 31 |
+
/*
|
| 32 |
+
Created on : Dec 29, 2014, 12:23:35 AM
|
| 33 |
+
Author : Matis
|
| 34 |
+
*/
|
| 35 |
+
.eabi_carrier
|
| 36 |
+
{
|
| 37 |
+
outline: none;
|
| 38 |
+
}
|
| 39 |
+
.eabi_carrier strong
|
| 40 |
+
{
|
| 41 |
+
line-height: 30px;
|
| 42 |
+
}
|
| 43 |
+
.eabi_carrier.over,
|
| 44 |
+
.eabi_carrier:hover
|
| 45 |
+
{
|
| 46 |
+
text-decoration: none;
|
| 47 |
+
}
|
| 48 |
+
.eabi_carrier .eabi_postoffice_comment
|
| 49 |
+
{
|
| 50 |
+
display: none;
|
| 51 |
+
line-height: 16px;
|
| 52 |
+
margin-left: 28px;
|
| 53 |
+
margin-top: -30px;
|
| 54 |
+
padding: 14px 20px;
|
| 55 |
+
width: 300px;
|
| 56 |
+
z-index: 10;
|
| 57 |
+
}
|
| 58 |
+
|
| 59 |
+
|
| 60 |
+
.eabi_carrier.over .eabi_postoffice_comment,
|
| 61 |
+
.eabi_carrier:hover .eabi_postoffice_comment
|
| 62 |
+
{
|
| 63 |
+
background: #eff5ea;
|
| 64 |
+
border: 1px solid #95a486;
|
| 65 |
+
color: #3d6611;
|
| 66 |
+
display: inline;
|
| 67 |
+
position: absolute;
|
| 68 |
+
}
|
| 69 |
+
.callout
|
| 70 |
+
{
|
| 71 |
+
border: 0;
|
| 72 |
+
left: -12px;
|
| 73 |
+
position: absolute;
|
| 74 |
+
top: 30px;
|
| 75 |
+
z-index: 20;
|
| 76 |
+
}
|
| 77 |
+
.eabi_carrier .eabi_postoffice_comment
|
| 78 |
+
{
|
| 79 |
+
border-radius: 4px;
|
| 80 |
+
box-shadow: 5px 5px 8px #CCC;
|
| 81 |
+
}
|
| 82 |
+
|
| 83 |
+
.eabi_carrier.over .eabi_postoffice_comment_error,
|
| 84 |
+
.eabi_carrier:hover .eabi_postoffice_comment_error {
|
| 85 |
+
background: #faebe7;
|
| 86 |
+
color: #df280a;
|
| 87 |
+
border-color: #f16048;
|
| 88 |
+
|
| 89 |
+
}
|
