Version Notes
Notes
Download this release
Release Info
Developer | Bobby Burden |
Extension | iparcel_logistics |
Version | 1.2.0 |
Comparing to | |
See all releases |
Code changes from version 1.1.0 to 1.2.0
- app/code/community/Iparcel/All/Block/Adminhtml/Iparcel/Logs.php +10 -4
- app/code/community/Iparcel/All/Block/Adminhtml/Iparcel/Logs/Grid.php +3 -23
- app/code/community/Iparcel/{Logistics/Block/Adminhtml/Iplogistics → All/Block/Adminhtml/Iparcel}/Shipment/Split.php +4 -4
- app/code/community/Iparcel/{Logistics/Block/Adminhtml/Iplogistics → All/Block/Adminhtml/Iparcel}/Shipment/Split/Form.php +3 -3
- app/code/community/Iparcel/{Logistics → All}/Block/Adminhtml/System/Config/Form/Field/Method.php +2 -2
- app/code/community/Iparcel/All/Block/Catalog/Product.php +21 -0
- app/code/community/Iparcel/All/Block/Catalog/Product/List.php +75 -0
- app/code/community/Iparcel/All/Block/Catalogsearch/Advanced/Result.php +43 -0
- app/code/community/Iparcel/All/Block/Catalogsearch/Result.php +42 -0
- app/code/community/Iparcel/All/Block/Html/Head/Iparcel.php +20 -0
- app/code/community/Iparcel/All/Block/Html/Head/Jquery.php +20 -0
- app/code/community/Iparcel/All/Block/Html/Head/Post.php +25 -0
- app/code/community/Iparcel/{Logistics → All}/Block/Sales/Order/Totals/Abstract.php +2 -2
- app/code/community/Iparcel/{Logistics → All}/Block/Sales/Order/Totals/Duty.php +4 -4
- app/code/community/Iparcel/{Logistics → All}/Block/Sales/Order/Totals/Tax.php +4 -4
- app/code/community/Iparcel/All/Helper/Api.php +414 -0
- app/code/community/Iparcel/All/Helper/Data.php +268 -0
- app/code/community/Iparcel/All/Helper/International.php +62 -0
- app/code/community/Iparcel/{Logistics → All}/Model/Api/Quote.php +5 -5
- app/code/community/Iparcel/All/Model/Carrier/Iparcel.php +163 -0
- app/code/community/Iparcel/All/Model/Config/Script/Js.php +94 -0
- app/code/community/Iparcel/All/Model/Log.php +3 -148
- app/code/community/Iparcel/{Logistics → All}/Model/Observer.php +16 -12
- app/code/community/Iparcel/{Logistics → All}/Model/Order/Creditmemo/Total/Duty.php +2 -2
- app/code/community/Iparcel/{Logistics → All}/Model/Order/Creditmemo/Total/Tax.php +2 -2
- app/code/community/Iparcel/{Logistics → All}/Model/Order/Invoice/Total/Duty.php +2 -2
- app/code/community/Iparcel/{Logistics → All}/Model/Order/Invoice/Total/Tax.php +2 -2
- app/code/community/Iparcel/All/Model/Payment/Iparcel.php +16 -0
- app/code/community/Iparcel/{Logistics → All}/Model/Quote/Address/Total/Abstract.php +3 -5
- app/code/community/Iparcel/All/Model/Quote/Address/Total/Collector.php +52 -0
- app/code/community/Iparcel/{Logistics → All}/Model/Quote/Address/Total/Duty.php +10 -10
- app/code/community/Iparcel/{Logistics → All}/Model/Quote/Address/Total/Tax.php +10 -9
- app/code/community/Iparcel/All/Model/Resource/Api/Quote.php +18 -0
- app/code/community/Iparcel/All/Model/Resource/Log.php +18 -0
- app/code/community/Iparcel/All/Model/Resource/Log/Collection.php +29 -0
- app/code/community/Iparcel/All/Model/Resource/Mysql4/Setup.php +11 -0
- app/code/community/Iparcel/{Logistics → All}/Model/Tax/Quote/Shipping.php +7 -9
- app/code/community/Iparcel/{Logistics/Model/Tax/Quote/Tax.php → All/Model/Tax/Quote/Subtotal.php} +5 -5
- app/code/community/Iparcel/{Logistics/Model/Tax/Quote/Subtotal.php → All/Model/Tax/Quote/Tax.php} +9 -7
- app/code/community/Iparcel/All/controllers/Adminhtml/Iparcel/LogController.php +39 -3
- app/code/community/Iparcel/{Logistics/controllers/Adminhtml/Iplogistics → All/controllers/Adminhtml/Iparcel}/Shipment/SplitController.php +3 -3
- app/code/community/Iparcel/{Logistics/controllers/Adminhtml/Iplogistics → All/controllers/Adminhtml/Iparcel}/ShipmentController.php +4 -4
- app/code/community/Iparcel/All/controllers/AjaxController.php +96 -0
- app/code/community/Iparcel/All/controllers/InternationalController.php +50 -0
- app/code/community/Iparcel/All/etc/config.xml +165 -1
- app/code/community/Iparcel/All/etc/system.xml +255 -0
- app/code/community/Iparcel/{Logistics/sql/iplogistics_setup/mysql4-upgrade-1.0.5-1.0.6.php → All/sql/iparcel_setup/mysql4-upgrade-1.0.0-1.1.0.php} +15 -5
- app/code/community/Iparcel/{Logistics/sql/iplogistics_setup/mysql4-upgrade-1.0.0-1.0.1.php → All/sql/iparcel_setup/mysql4-upgrade-1.1.0-1.1.1.php} +2 -0
- app/code/community/Iparcel/All/sql/iparcel_setup/mysql4-upgrade-1.1.1-1.2.0.php +19 -0
- app/code/community/Iparcel/Logistics/Helper/Api.php +0 -467
- app/code/community/Iparcel/Logistics/Helper/Data.php +0 -202
- app/code/community/Iparcel/Logistics/Model/Carrier/Iparcel.php +0 -234
- app/code/community/Iparcel/Logistics/Model/Quote/Address/Total/Collector.php +0 -29
- app/code/community/Iparcel/Logistics/Model/Resource/Api/Quote.php +0 -18
- app/code/community/Iparcel/Logistics/Model/System/Config/Source/Tax/Mode.php +0 -28
- app/code/community/Iparcel/Logistics/etc/config.xml +4 -151
- app/code/community/Iparcel/Logistics/etc/system.xml +2 -171
- app/code/community/Iparcel/Logistics/sql/iplogistics_setup/mysql4-install-1.0.0.php +0 -26
- app/code/community/Iparcel/Logistics/sql/iplogistics_setup/mysql4-upgrade-1.0.1-1.0.2.php +0 -18
- app/code/community/Iparcel/Logistics/sql/iplogistics_setup/mysql4-upgrade-1.0.3-1.0.4.php +0 -12
- app/design/adminhtml/default/default/layout/iparcel.xml +63 -0
- app/design/adminhtml/default/default/layout/iplogistics.xml +0 -72
- app/design/adminhtml/default/default/template/{iplogistics → iparcel}/order/totals/duty.phtml +1 -1
- app/design/adminhtml/default/default/template/{iplogistics → iparcel}/order/totals/tax.phtml +1 -1
- app/design/adminhtml/default/default/template/iplogistics/shipment/split/form.phtml +0 -20
- app/design/adminhtml/default/default/template/iplogistics/shipment/split/items.phtml +0 -67
- app/design/adminhtml/default/default/template/iplogistics/shipment/split/renderer/default.phtml +0 -19
- app/design/frontend/base/default/layout/iparcel.xml +102 -0
- app/design/frontend/base/default/layout/iplogistics.xml +0 -65
- app/design/frontend/base/default/template/iparcel/html/head/iparcel.phtml +14 -0
- app/design/frontend/base/default/template/iparcel/html/head/jquery.phtml +12 -0
- app/design/frontend/base/default/template/iparcel/html/head/post.phtml +12 -0
- app/design/frontend/base/default/template/iparcel/post.phtml +11 -0
- app/design/frontend/base/default/template/iparcel/post/list.phtml +24 -0
- app/locale/en_US/iparcel.csv +5 -0
- js/{iparcel-logistics → iparcel}/adminhtml/shipping-methods.js +0 -0
- js/iparcel/jQuery.js +4 -0
- js/iparcel/lib.js +46 -0
- js/iparcel/post.js +172 -0
- package.xml +4 -4
app/code/community/Iparcel/All/Block/Adminhtml/Iparcel/Logs.php
CHANGED
@@ -2,9 +2,9 @@
|
|
2 |
/**
|
3 |
* Adminhtml i-parcel logs grid container block
|
4 |
*
|
5 |
-
* @category
|
6 |
-
* @package
|
7 |
-
* @author
|
8 |
*/
|
9 |
class Iparcel_All_Block_Adminhtml_Iparcel_Logs extends Mage_Adminhtml_Block_Widget_Grid_Container
|
10 |
{
|
@@ -30,7 +30,13 @@ class Iparcel_All_Block_Adminhtml_Iparcel_Logs extends Mage_Adminhtml_Block_Widg
|
|
30 |
|
31 |
$this->_addButton('clear', array(
|
32 |
'label' => $this->__('Clear'),
|
33 |
-
'
|
|
|
|
|
|
|
|
|
|
|
|
|
34 |
));
|
35 |
|
36 |
return parent::_prepareLayout();
|
2 |
/**
|
3 |
* Adminhtml i-parcel logs grid container block
|
4 |
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
class Iparcel_All_Block_Adminhtml_Iparcel_Logs extends Mage_Adminhtml_Block_Widget_Grid_Container
|
10 |
{
|
30 |
|
31 |
$this->_addButton('clear', array(
|
32 |
'label' => $this->__('Clear'),
|
33 |
+
'class' => 'delete',
|
34 |
+
'onclick' => 'confirmSetLocation(\'Are you sure you want to clear all log entries?\', \''.$this->getUrl('*/*/clear').'\')'
|
35 |
+
));
|
36 |
+
|
37 |
+
$this->_addButton('download', array(
|
38 |
+
'label' => $this->__('Download Log'),
|
39 |
+
'onclick' => 'setLocation(\''.$this->getUrl('*/*/download').'\')'
|
40 |
));
|
41 |
|
42 |
return parent::_prepareLayout();
|
app/code/community/Iparcel/All/Block/Adminhtml/Iparcel/Logs/Grid.php
CHANGED
@@ -8,16 +8,6 @@
|
|
8 |
*/
|
9 |
class Iparcel_All_Block_Adminhtml_Iparcel_Logs_Grid extends Mage_Adminhtml_Block_Widget_Grid
|
10 |
{
|
11 |
-
/**
|
12 |
-
* Internal constructor, that is called from real constructor
|
13 |
-
*
|
14 |
-
*/
|
15 |
-
protected function _construct()
|
16 |
-
{
|
17 |
-
$this->setFilterVisibility(false);
|
18 |
-
$this->setPagerVisibility(false);
|
19 |
-
}
|
20 |
-
|
21 |
/**
|
22 |
* Prepare grid collection object
|
23 |
*
|
@@ -25,7 +15,7 @@ class Iparcel_All_Block_Adminhtml_Iparcel_Logs_Grid extends Mage_Adminhtml_Block
|
|
25 |
*/
|
26 |
protected function _prepareCollection()
|
27 |
{
|
28 |
-
$collection = Mage::getModel('iparcel/log')->
|
29 |
$this->setCollection($collection);
|
30 |
|
31 |
return parent::_prepareCollection();
|
@@ -38,9 +28,9 @@ class Iparcel_All_Block_Adminhtml_Iparcel_Logs_Grid extends Mage_Adminhtml_Block
|
|
38 |
*/
|
39 |
protected function _prepareColumns()
|
40 |
{
|
41 |
-
$this->addColumn('
|
42 |
'header' => $this->__('Timestamp'),
|
43 |
-
'index' => '
|
44 |
'width' => '200px'
|
45 |
));
|
46 |
$this->addColumn('controller', array(
|
@@ -59,14 +49,4 @@ class Iparcel_All_Block_Adminhtml_Iparcel_Logs_Grid extends Mage_Adminhtml_Block
|
|
59 |
|
60 |
return parent::_prepareColumns();
|
61 |
}
|
62 |
-
|
63 |
-
/**
|
64 |
-
* Get Grid Row's Class
|
65 |
-
*
|
66 |
-
* $return string
|
67 |
-
*/
|
68 |
-
public function getRowClass()
|
69 |
-
{
|
70 |
-
return 'read';
|
71 |
-
}
|
72 |
}
|
8 |
*/
|
9 |
class Iparcel_All_Block_Adminhtml_Iparcel_Logs_Grid extends Mage_Adminhtml_Block_Widget_Grid
|
10 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
11 |
/**
|
12 |
* Prepare grid collection object
|
13 |
*
|
15 |
*/
|
16 |
protected function _prepareCollection()
|
17 |
{
|
18 |
+
$collection = Mage::getModel('iparcel/log')->getCollection();
|
19 |
$this->setCollection($collection);
|
20 |
|
21 |
return parent::_prepareCollection();
|
28 |
*/
|
29 |
protected function _prepareColumns()
|
30 |
{
|
31 |
+
$this->addColumn('created_at', array(
|
32 |
'header' => $this->__('Timestamp'),
|
33 |
+
'index' => 'created_at',
|
34 |
'width' => '200px'
|
35 |
));
|
36 |
$this->addColumn('controller', array(
|
49 |
|
50 |
return parent::_prepareColumns();
|
51 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
52 |
}
|
app/code/community/Iparcel/{Logistics/Block/Adminhtml/Iplogistics → All/Block/Adminhtml/Iparcel}/Shipment/Split.php
RENAMED
@@ -3,15 +3,15 @@
|
|
3 |
* Block for splitting shipments
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
public function __construct()
|
12 |
{
|
13 |
$this->_objectId = 'shipment_id';
|
14 |
-
$this->_controller = '
|
15 |
$this->_mode = 'create';
|
16 |
|
17 |
parent::__construct();
|
@@ -32,7 +32,7 @@ class Iparcel_Logistics_Block_Adminhtml_Iplogistics_Shipment_Split extends Mage_
|
|
32 |
|
33 |
public function getHeaderText()
|
34 |
{
|
35 |
-
$header = Mage::helper('
|
36 |
return $header;
|
37 |
}
|
38 |
|
3 |
* Block for splitting shipments
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Block_Adminhtml_Iplogistics_Shipment_Split extends Mage_Adminhtml_Block_Widget_Form_Container
|
10 |
{
|
11 |
public function __construct()
|
12 |
{
|
13 |
$this->_objectId = 'shipment_id';
|
14 |
+
$this->_controller = 'iparcel_shipment';
|
15 |
$this->_mode = 'create';
|
16 |
|
17 |
parent::__construct();
|
32 |
|
33 |
public function getHeaderText()
|
34 |
{
|
35 |
+
$header = Mage::helper('iparcel')->__('Split Shipment #%s', $this->getShipment()->getIncrementId());
|
36 |
return $header;
|
37 |
}
|
38 |
|
app/code/community/Iparcel/{Logistics/Block/Adminhtml/Iplogistics → All/Block/Adminhtml/Iparcel}/Shipment/Split/Form.php
RENAMED
@@ -3,10 +3,10 @@
|
|
3 |
* Block for splitting shipments form
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
/**
|
12 |
* Retrieve shipment model instance
|
@@ -25,6 +25,6 @@ class Iparcel_Logistics_Block_Adminhtml_Iplogistics_Shipment_Split_Form extends
|
|
25 |
|
26 |
public function getSaveUrl()
|
27 |
{
|
28 |
-
return $this->getUrl('*/
|
29 |
}
|
30 |
}
|
3 |
* Block for splitting shipments form
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Block_Adminhtml_Iplogistics_Shipment_Split_Form extends Mage_Adminhtml_Block_Sales_Order_Abstract
|
10 |
{
|
11 |
/**
|
12 |
* Retrieve shipment model instance
|
25 |
|
26 |
public function getSaveUrl()
|
27 |
{
|
28 |
+
return $this->getUrl('*/iparcel_shipment_split/save', array('shipment' => $this->getShipment()));
|
29 |
}
|
30 |
}
|
app/code/community/Iparcel/{Logistics → All}/Block/Adminhtml/System/Config/Form/Field/Method.php
RENAMED
@@ -3,10 +3,10 @@
|
|
3 |
* Form Field for Methods Names
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
public function __construct()
|
12 |
{
|
3 |
* Form Field for Methods Names
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Block_Adminhtml_System_Config_Form_Field_Method extends Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract
|
10 |
{
|
11 |
public function __construct()
|
12 |
{
|
app/code/community/Iparcel/All/Block/Catalog/Product.php
ADDED
@@ -0,0 +1,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Product for i-parcel shipping extension
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Block_Catalog_Product extends Mage_Catalog_Block_Product_View
|
10 |
+
{
|
11 |
+
/**
|
12 |
+
* Retrieve qty for product
|
13 |
+
*
|
14 |
+
* @param Mage_Catalog_Model_Product $product
|
15 |
+
* @return float
|
16 |
+
*/
|
17 |
+
public function getStock()
|
18 |
+
{
|
19 |
+
return Mage::getModel('cataloginventory/stock_item')->loadByProduct($this->getProduct())->getQty();
|
20 |
+
}
|
21 |
+
}
|
app/code/community/Iparcel/All/Block/Catalog/Product/List.php
ADDED
@@ -0,0 +1,75 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Product list for i-parcel shipping extension
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Block_Catalog_Product_List extends Mage_Catalog_Block_Product_List
|
10 |
+
{
|
11 |
+
/**
|
12 |
+
* Retrieve loaded category collection
|
13 |
+
*
|
14 |
+
* @return Mage_Eav_Model_Entity_Collection_Abstract
|
15 |
+
*/
|
16 |
+
protected function _getProductCollection()
|
17 |
+
{
|
18 |
+
if (is_null($this->_productCollection)) {
|
19 |
+
$layer = $this->getLayer();
|
20 |
+
/* @var $layer Mage_Catalog_Model_Layer */
|
21 |
+
if ($this->getShowRootCategory()) {
|
22 |
+
$this->setCategoryId(Mage::app()->getStore()->getRootCategoryId());
|
23 |
+
}
|
24 |
+
|
25 |
+
// if this is a product view page
|
26 |
+
if (Mage::registry('product')) {
|
27 |
+
// get collection of categories this product is associated with
|
28 |
+
$categories = Mage::registry('product')->getCategoryCollection()
|
29 |
+
->setPage(1, 1)
|
30 |
+
->load();
|
31 |
+
// if the product is associated with any category
|
32 |
+
if ($categories->count()) {
|
33 |
+
// show products from this category
|
34 |
+
$this->setCategoryId(current($categories->getIterator()));
|
35 |
+
}
|
36 |
+
}
|
37 |
+
|
38 |
+
$origCategory = null;
|
39 |
+
if ($this->getCategoryId()) {
|
40 |
+
$category = Mage::getModel('catalog/category')->load($this->getCategoryId());
|
41 |
+
if ($category->getId()) {
|
42 |
+
$origCategory = $layer->getCurrentCategory();
|
43 |
+
$layer->setCurrentCategory($category);
|
44 |
+
}
|
45 |
+
}
|
46 |
+
$this->_productCollection = $layer->getProductCollection();
|
47 |
+
|
48 |
+
$helper = Mage::helper('iparcel/international');
|
49 |
+
// if international customer enabled and it is international customer
|
50 |
+
if ($helper->checkEnabled() && $helper->getInternational()) {
|
51 |
+
// add international visibility attribute to filter
|
52 |
+
$this->_productCollection->addAttributeToFilter($helper->getVisibilityAttributeName(), true);
|
53 |
+
}
|
54 |
+
|
55 |
+
$this->prepareSortableFieldsByCategory($layer->getCurrentCategory());
|
56 |
+
|
57 |
+
if ($origCategory) {
|
58 |
+
$layer->setCurrentCategory($origCategory);
|
59 |
+
}
|
60 |
+
}
|
61 |
+
|
62 |
+
return $this->_productCollection;
|
63 |
+
}
|
64 |
+
|
65 |
+
/**
|
66 |
+
* Retrieve qty for product
|
67 |
+
*
|
68 |
+
* @param Mage_Catalog_Model_Product $product
|
69 |
+
* $return float
|
70 |
+
*/
|
71 |
+
public function getStock($product)
|
72 |
+
{
|
73 |
+
return Mage::getModel('cataloginventory/stock_item')->loadByProduct($product)->getQty();
|
74 |
+
}
|
75 |
+
}
|
app/code/community/Iparcel/All/Block/Catalogsearch/Advanced/Result.php
ADDED
@@ -0,0 +1,43 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* CatalogSearch list for i-parcel extension
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Block_Catalogsearch_Advanced_Result extends Mage_CatalogSearch_Block_Advanced_Result
|
10 |
+
{
|
11 |
+
protected $_productCollection;
|
12 |
+
|
13 |
+
protected function _getProductCollection()
|
14 |
+
{
|
15 |
+
if (is_null($this->_productCollection)) {
|
16 |
+
$this->_productCollection = $this->getSearchModel()->getProductCollection();
|
17 |
+
|
18 |
+
$helper = Mage::helper('iparcel/international');
|
19 |
+
// if international customer enabled and it is international customer
|
20 |
+
if ($helper->checkEnabled() && $helper->getInternational()) {
|
21 |
+
// add international visibility attribute to filter
|
22 |
+
$this->_productCollection->addAttributeToFilter($helper->getVisibilityAttributeName(), true);
|
23 |
+
}
|
24 |
+
}
|
25 |
+
return $this->_productCollection;
|
26 |
+
}
|
27 |
+
|
28 |
+
public function getLoadedProductCollection()
|
29 |
+
{
|
30 |
+
return $this->_getProductCollection();
|
31 |
+
}
|
32 |
+
|
33 |
+
/**
|
34 |
+
* Retrieve qty for product
|
35 |
+
*
|
36 |
+
* @param Mage_Catalog_Model_Product $product
|
37 |
+
* $return float
|
38 |
+
*/
|
39 |
+
public function getStock($product)
|
40 |
+
{
|
41 |
+
return Mage::getModel('cataloginventory/stock_item')->loadByProduct($product)->getQty();
|
42 |
+
}
|
43 |
+
}
|
app/code/community/Iparcel/All/Block/Catalogsearch/Result.php
ADDED
@@ -0,0 +1,42 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* CatalogSearch list for i-parcel extension
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Block_Catalogsearch_Result extends Mage_CatalogSearch_Block_Result
|
10 |
+
{
|
11 |
+
protected function _getProductCollection()
|
12 |
+
{
|
13 |
+
if (is_null($this->_productCollection)) {
|
14 |
+
$this->_productCollection = $this->getListBlock()->getLoadedProductCollection();
|
15 |
+
|
16 |
+
$helper = Mage::helper('iparcel/international');
|
17 |
+
// if international customer enabled and it is international customer
|
18 |
+
if ($helper->checkEnabled() && $helper->getInternational()) {
|
19 |
+
// add international visibility attribute to filter
|
20 |
+
$this->_productCollection->addAttributeToFilter($helper->getVisibilityAttributeName(), true);
|
21 |
+
}
|
22 |
+
}
|
23 |
+
|
24 |
+
return $this->_productCollection;
|
25 |
+
}
|
26 |
+
|
27 |
+
public function getLoadedProductCollection()
|
28 |
+
{
|
29 |
+
return $this->_getProductCollection();
|
30 |
+
}
|
31 |
+
|
32 |
+
/**
|
33 |
+
* Retrieve qty for product
|
34 |
+
*
|
35 |
+
* @param Mage_Catalog_Model_Product $product
|
36 |
+
* $return float
|
37 |
+
*/
|
38 |
+
public function getStock($product)
|
39 |
+
{
|
40 |
+
return Mage::getModel('cataloginventory/stock_item')->loadByProduct($product)->getQty();
|
41 |
+
}
|
42 |
+
}
|
app/code/community/Iparcel/All/Block/Html/Head/Iparcel.php
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* i-parcel frontend scripts block
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Block_Html_Head_Iparcel extends Mage_Core_Block_Template
|
10 |
+
{
|
11 |
+
/**
|
12 |
+
* Checking if frontend scripts are enabled
|
13 |
+
*
|
14 |
+
* @return string
|
15 |
+
*/
|
16 |
+
public function getFlag()
|
17 |
+
{
|
18 |
+
return Mage::getStoreConfigFlag('iparcel/scripts/scripts');
|
19 |
+
}
|
20 |
+
}
|
app/code/community/Iparcel/All/Block/Html/Head/Jquery.php
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* i-parcel jQuery block
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Block_Html_Head_Jquery extends Mage_Core_Block_Template
|
10 |
+
{
|
11 |
+
/**
|
12 |
+
* Checking if i-parcel's jQuery is enabled
|
13 |
+
*
|
14 |
+
* @return string
|
15 |
+
*/
|
16 |
+
public function getFlag()
|
17 |
+
{
|
18 |
+
return Mage::getStoreConfigFlag('iparcel/scripts/jquery');
|
19 |
+
}
|
20 |
+
}
|
app/code/community/Iparcel/All/Block/Html/Head/Post.php
ADDED
@@ -0,0 +1,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* i-parcel custom post script block
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Block_Html_Head_Post extends Mage_Core_Block_Template
|
10 |
+
{
|
11 |
+
/**
|
12 |
+
* Checking if there's store config for custom post script, if yes returning script directory, if not returning default directory
|
13 |
+
*
|
14 |
+
* @return array
|
15 |
+
*/
|
16 |
+
public function getScript()
|
17 |
+
{
|
18 |
+
$postScripts = array('iparcel/post.js');
|
19 |
+
$file = Mage::getStoreConfig('iparcel/scripts/post');
|
20 |
+
if ($file) {
|
21 |
+
$postScripts[] = Mage::getModel('iparcel/config_script_js')->getUploadDir('post') . $file;
|
22 |
+
}
|
23 |
+
return $postScripts;
|
24 |
+
}
|
25 |
+
}
|
app/code/community/Iparcel/{Logistics → All}/Block/Sales/Order/Totals/Abstract.php
RENAMED
@@ -3,10 +3,10 @@
|
|
3 |
* i-parcel model for shipping duty display to frontend order views
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
/**
|
12 |
* Returns Magento Order
|
3 |
* i-parcel model for shipping duty display to frontend order views
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Block_Sales_Order_Totals_Abstract extends Mage_Core_Block_Template
|
10 |
{
|
11 |
/**
|
12 |
* Returns Magento Order
|
app/code/community/Iparcel/{Logistics → All}/Block/Sales/Order/Totals/Duty.php
RENAMED
@@ -3,15 +3,15 @@
|
|
3 |
* i-parcel model for shipping duty display to frontend order views
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
/**
|
12 |
* Find and display duty for current order/credit memo
|
13 |
*
|
14 |
-
* @return
|
15 |
*/
|
16 |
public function initTotals()
|
17 |
{
|
@@ -22,7 +22,7 @@ class Iparcel_Logistics_Block_Sales_Order_Totals_Duty extends Iparcel_Logistics_
|
|
22 |
$this->getParentBlock()->addTotal(new Varien_Object(array(
|
23 |
'code' => 'iparcel_duty',
|
24 |
'strong' => false,
|
25 |
-
'label' => Mage::helper('
|
26 |
'value' => $value
|
27 |
)));
|
28 |
}
|
3 |
* i-parcel model for shipping duty display to frontend order views
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Block_Sales_Order_Totals_Duty extends Iparcel_All_Block_Sales_Order_Totals_Abstract
|
10 |
{
|
11 |
/**
|
12 |
* Find and display duty for current order/credit memo
|
13 |
*
|
14 |
+
* @return Iparcel_All_Block_Sales_Order_Totals_Duty
|
15 |
*/
|
16 |
public function initTotals()
|
17 |
{
|
22 |
$this->getParentBlock()->addTotal(new Varien_Object(array(
|
23 |
'code' => 'iparcel_duty',
|
24 |
'strong' => false,
|
25 |
+
'label' => Mage::helper('iparcel')->getDutyLabel(),
|
26 |
'value' => $value
|
27 |
)));
|
28 |
}
|
app/code/community/Iparcel/{Logistics → All}/Block/Sales/Order/Totals/Tax.php
RENAMED
@@ -3,15 +3,15 @@
|
|
3 |
* i-parcel model for shipping tax display to frontend order views
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
/**
|
12 |
* Find and display tax for current order/credit memo
|
13 |
*
|
14 |
-
* @return
|
15 |
*/
|
16 |
public function initTotals()
|
17 |
{
|
@@ -22,7 +22,7 @@ class Iparcel_Logistics_Block_Sales_Order_Totals_Tax extends Iparcel_Logistics_B
|
|
22 |
$this->getParentBlock()->addTotal(new Varien_Object(array(
|
23 |
'code' => 'iparcel_tax',
|
24 |
'strong' => false,
|
25 |
-
'label' => Mage::helper('
|
26 |
'value' => $value
|
27 |
)));
|
28 |
}
|
3 |
* i-parcel model for shipping tax display to frontend order views
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Block_Sales_Order_Totals_Tax extends Iparcel_All_Block_Sales_Order_Totals_Abstract
|
10 |
{
|
11 |
/**
|
12 |
* Find and display tax for current order/credit memo
|
13 |
*
|
14 |
+
* @return Iparcel_All_Block_Sales_Order_Totals_Duty
|
15 |
*/
|
16 |
public function initTotals()
|
17 |
{
|
22 |
$this->getParentBlock()->addTotal(new Varien_Object(array(
|
23 |
'code' => 'iparcel_tax',
|
24 |
'strong' => false,
|
25 |
+
'label' => Mage::helper('iparcel')->getTaxLabel(),
|
26 |
'value' => $value
|
27 |
)));
|
28 |
}
|
app/code/community/Iparcel/All/Helper/Api.php
CHANGED
@@ -8,9 +8,21 @@
|
|
8 |
*/
|
9 |
class Iparcel_All_Helper_Api
|
10 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
11 |
/** @var string URL for the SubmitCatalog endpoint */
|
12 |
protected $_submitCatalog = 'https://webservices.i-parcel.com/api/SubmitCatalog';
|
13 |
|
|
|
|
|
|
|
|
|
|
|
|
|
14 |
/**
|
15 |
* Send POST requests to the REST API
|
16 |
*
|
@@ -74,6 +86,175 @@ class Iparcel_All_Helper_Api
|
|
74 |
);
|
75 |
}
|
76 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
77 |
/**
|
78 |
* Send SubmitCatalog request
|
79 |
*
|
@@ -111,6 +292,239 @@ class Iparcel_All_Helper_Api
|
|
111 |
return $numberToUpload;
|
112 |
}
|
113 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
114 |
/**
|
115 |
* Prepare product collection for SubmitCatalog calls
|
116 |
*
|
8 |
*/
|
9 |
class Iparcel_All_Helper_Api
|
10 |
{
|
11 |
+
/** @var string URL for the Cancel endpoint */
|
12 |
+
protected $_cancel = 'https://webservices.i-parcel.com/api/Cancel';
|
13 |
+
|
14 |
+
/** @var string URL for the Split endpoint */
|
15 |
+
protected $_split = 'https://webservices.i-parcel.com/api/Split';
|
16 |
+
|
17 |
/** @var string URL for the SubmitCatalog endpoint */
|
18 |
protected $_submitCatalog = 'https://webservices.i-parcel.com/api/SubmitCatalog';
|
19 |
|
20 |
+
/** @var string URL for the SubmitParcel endpoint */
|
21 |
+
protected $_submitParcel = 'https://webservices.i-parcel.com/api/SubmitParcel';
|
22 |
+
|
23 |
+
/** @var string URL for the Quote endpoint */
|
24 |
+
protected $_quote = 'https://webservices.i-parcel.com/api/Quote';
|
25 |
+
|
26 |
/**
|
27 |
* Send POST requests to the REST API
|
28 |
*
|
86 |
);
|
87 |
}
|
88 |
|
89 |
+
/**
|
90 |
+
* Cancels shipments via the Web Service API
|
91 |
+
*
|
92 |
+
* @param Mage_Sales_Model_Order_Shipment $shipment
|
93 |
+
* @return bool
|
94 |
+
*/
|
95 |
+
public function cancelShipment(Mage_Sales_Model_Order_Shipment $shipment)
|
96 |
+
{
|
97 |
+
$json = array();
|
98 |
+
$json['TrackingNumber'] = Mage::helper('iparcel')->getTrackingNumber($shipment);
|
99 |
+
$json['UserNotes'] = '';
|
100 |
+
$json['Key'] = Mage::helper('iparcel')->getGuid();
|
101 |
+
|
102 |
+
$response = $this->_restJSON($json, $this->_cancel);
|
103 |
+
|
104 |
+
$log = Mage::getModel('iparcel/log');
|
105 |
+
$log->setRequest(json_encode($json));
|
106 |
+
$log->setResponse($response);
|
107 |
+
$log->setController('Cancel Shipment');
|
108 |
+
$log->save();
|
109 |
+
|
110 |
+
$response = json_decode($response);
|
111 |
+
|
112 |
+
if ($response->Code != 1) {
|
113 |
+
Mage::throwException(
|
114 |
+
'Failed when canceling shipment: ' . $response->Message
|
115 |
+
);
|
116 |
+
} else {
|
117 |
+
Mage::getModel('sales/order_shipment_api')->addComment(
|
118 |
+
$shipment->getIncrementId(),
|
119 |
+
'Shipment canceled',
|
120 |
+
false,
|
121 |
+
false
|
122 |
+
);
|
123 |
+
}
|
124 |
+
|
125 |
+
return true;
|
126 |
+
}
|
127 |
+
|
128 |
+
/**
|
129 |
+
* Cancels all shipments of an order
|
130 |
+
*
|
131 |
+
* @param Mage_Sales_Model_Order $order
|
132 |
+
* @return bool
|
133 |
+
*/
|
134 |
+
public function cancelShipmentsByOrder(Mage_Sales_Model_Order $order)
|
135 |
+
{
|
136 |
+
if (!Mage::helper('iparcel')->isIparcelOrder($order)) {
|
137 |
+
return true;
|
138 |
+
}
|
139 |
+
|
140 |
+
$shipmentsCollection = $order->getShipmentsCollection();
|
141 |
+
|
142 |
+
foreach ($shipmentsCollection as $shipment) {
|
143 |
+
$this->cancelShipment($shipment);
|
144 |
+
}
|
145 |
+
|
146 |
+
return true;
|
147 |
+
}
|
148 |
+
|
149 |
+
|
150 |
+
/**
|
151 |
+
* Send Quote request
|
152 |
+
*
|
153 |
+
* Takes the passed Rate Request and transforms it into data that can
|
154 |
+
* be passed to the API. It then submits the request as JSON to the
|
155 |
+
* Quote API endpoint.
|
156 |
+
*
|
157 |
+
* @param Mage_Shipping_Model_Rate_Request $request Magento Shipping Rate Request
|
158 |
+
* @return stdClass Response from the Quote API
|
159 |
+
*/
|
160 |
+
public function quote(Mage_Shipping_Model_Rate_Request $request)
|
161 |
+
{
|
162 |
+
// log init
|
163 |
+
$log = Mage::getModel('iparcel/log');
|
164 |
+
/* var $log Iparcel_All_Model_Api_Log */
|
165 |
+
$log->setController('Quote');
|
166 |
+
$quote = Mage::getModel('checkout/cart')->getQuote();
|
167 |
+
/* var $quote Mage_Sales_Model_Quote */
|
168 |
+
$shippingAddress = $quote->getShippingAddress();
|
169 |
+
/* var $shippingAddress Mage_Sales_Model_Quote_Address */
|
170 |
+
$billingAddress = $quote->getBillingAddress();
|
171 |
+
/* var $billingAddress Mage_Sales_Model_Quote_Address */
|
172 |
+
$json = array();
|
173 |
+
$addressInfo = array();
|
174 |
+
$billingStreet = $billingAddress->getStreet();
|
175 |
+
$billing = array();
|
176 |
+
$billing['City'] = $billingAddress->getCity();
|
177 |
+
$billing['CountryCode'] = $billingAddress->getCountryId();
|
178 |
+
$billing['Email'] = $quote->getCustomerEmail();
|
179 |
+
$billing['FirstName'] = $billingAddress->getFirstname();
|
180 |
+
$billing['LastName'] = $billingAddress->getLastname();
|
181 |
+
$billing['Phone'] = $billingAddress->getTelephone();
|
182 |
+
$billing['PostCode'] = $billingAddress->getPostcode();
|
183 |
+
$billing['Region'] = $billingAddress->getRegion();
|
184 |
+
for ($i=0; $i<count($billingStreet); $i++) {
|
185 |
+
$billing['Street'.($i+1)] = $billingStreet[$i];
|
186 |
+
}
|
187 |
+
$addressInfo['Billing'] = $billing;
|
188 |
+
$shippingStreet = explode("\n", $request->getDestStreet());
|
189 |
+
$shipping = array();
|
190 |
+
$shipping['City'] = $request->getDestCity();
|
191 |
+
$shipping['CountryCode'] = $request->getDestCountryId();
|
192 |
+
$shipping['Email'] = $quote->getCustomerEmail();
|
193 |
+
$shipping['FirstName'] = $shippingAddress->getFirstname();
|
194 |
+
$shipping['LastName'] = $shippingAddress->getLastname();
|
195 |
+
$shipping['Phone'] = $shippingAddress->getTelephone();
|
196 |
+
$shipping['PostCode'] = $request->getDestPostcode();
|
197 |
+
$shipping['Region'] = $request->getDestRegionCode();
|
198 |
+
foreach($shippingStreet as $key => $value) {
|
199 |
+
$shipping['Street' . ($key + 1)] = $value;
|
200 |
+
}
|
201 |
+
$addressInfo['Shipping'] = $shipping;
|
202 |
+
$addressInfo['ControlNumber'] = $quote->getCpf();
|
203 |
+
$json['AddressInfo'] = $addressInfo;
|
204 |
+
$json['CurrencyCode'] = $request->getPackageCurrency()->getCurrencyCode();
|
205 |
+
$json['DDP'] = true;
|
206 |
+
$itemsList = array();
|
207 |
+
foreach ($request->getAllItems() as $item) {
|
208 |
+
/* var $item Mage_Sales_Model_Quote_Item */
|
209 |
+
$itemProduct = Mage::getModel('catalog/product')->load($item->getProductId());
|
210 |
+
/* var $itemProduct Mage_Catalog_Model_Product */
|
211 |
+
//get item price
|
212 |
+
$itemPrice = (float)$item->getFinalPrice() ?: (float)$item->getPrice();
|
213 |
+
// if not price and item has parent (is configurable)
|
214 |
+
if (!$itemPrice && ($parent=$item->getParentItem())) {
|
215 |
+
// get parent price
|
216 |
+
$itemPrice = (float)$parent->getFinalPrice() ?: (float)$parent->getPrice();
|
217 |
+
}
|
218 |
+
// if still not price
|
219 |
+
if (!$itemPrice) {
|
220 |
+
// get product price
|
221 |
+
$itemPrice = (float)$item->getProduct()->getPrice();
|
222 |
+
}
|
223 |
+
// if product isn't virtual and is configurable or downloadable
|
224 |
+
if ($item["is_virtual"] == false && !in_array($itemProduct->getTypeId(), array('configurable','downloadable'))) {
|
225 |
+
// add line item node
|
226 |
+
$lineItem = array();
|
227 |
+
$lineItem['SKU'] = $item->getSku();
|
228 |
+
$lineItem['CustWeightLbs'] = (float)$item->getWeight();
|
229 |
+
$lineItem['ValueUSD'] = $itemPrice;
|
230 |
+
$lineItem['CustLengthInches'] = (float)$item->getLength();
|
231 |
+
$lineItem['CustWidthInches'] = (float)$item->getWidth();
|
232 |
+
$lineItem['CustHeightInches'] = (float)$item->getHeight();
|
233 |
+
$lineItem['Quantity'] = $item->getTotalQty();
|
234 |
+
$lineItem['ValueShopperCurrency'] = $itemPrice;
|
235 |
+
$lineItem['ShopperCurrency'] = Mage::app()->getStore()->getCurrentCurrencyCode();
|
236 |
+
$itemsList[] = $lineItem;
|
237 |
+
}
|
238 |
+
}
|
239 |
+
$json['ItemDetailsList'] = $itemsList;
|
240 |
+
// Get discounts
|
241 |
+
$totals = $quote->getTotals();
|
242 |
+
$discount = 0;
|
243 |
+
if (isset($totals['discount']) && $totals['discount']->getValue()) {
|
244 |
+
$discount = -1 * $totals['discount']->getValue();
|
245 |
+
}
|
246 |
+
$json['OtherDiscount'] = $discount;
|
247 |
+
$json['OtherDiscountCurrency'] = $quote->getQuoteCurrencyCode();
|
248 |
+
$json['ParcelID'] = 0;
|
249 |
+
$json['SessionID'] = '';
|
250 |
+
$json['key'] = Mage::helper('iparcel')->getGuid();
|
251 |
+
$log->setRequest(json_encode($json));
|
252 |
+
$response = $this->_restJSON($json, $this->_quote);
|
253 |
+
$log->setResponse($response);
|
254 |
+
$log->save();
|
255 |
+
return json_decode($response);
|
256 |
+
}
|
257 |
+
|
258 |
/**
|
259 |
* Send SubmitCatalog request
|
260 |
*
|
292 |
return $numberToUpload;
|
293 |
}
|
294 |
|
295 |
+
/**
|
296 |
+
* Send Submit Parcel request
|
297 |
+
*
|
298 |
+
* Takes the passed Shipment and transforms it into data that can be passed
|
299 |
+
* to the API. It then submits the request as JSON to the SubmitParcel API
|
300 |
+
* endpoint.
|
301 |
+
*
|
302 |
+
* @param Mage_Sales_Model_Order_Shipment $shipment Magento shipment to be acknowledged as parcel
|
303 |
+
* @return stdClass Response from the SubmitParcel API
|
304 |
+
*/
|
305 |
+
public function submitParcel(Mage_Sales_Model_Order_Shipment $shipment)
|
306 |
+
{
|
307 |
+
$order = $shipment->getOrder();
|
308 |
+
// init log
|
309 |
+
$log = Mage::getModel('iparcel/log');
|
310 |
+
/* var $log Iparcel_All_Model_Api_Log */
|
311 |
+
$log->setController('Submit Parcel');
|
312 |
+
$shippingAddress = $order->getShippingAddress();
|
313 |
+
/* var $shippingAddress Mage_Sales_Model_Quote_Address */
|
314 |
+
$billingAddress = $order->getBillingAddress();
|
315 |
+
/* var $billingAddress Mage_Sales_Model_Quote_Address */
|
316 |
+
$json = array();
|
317 |
+
$addressInfo = array();
|
318 |
+
$billingStreet = $billingAddress->getStreet();
|
319 |
+
$billing = array();
|
320 |
+
$billing['City'] = $billingAddress->getCity();
|
321 |
+
$billing['CountryCode'] = $billingAddress->getCountryId();
|
322 |
+
$billing['Email'] = $order->getCustomerEmail();
|
323 |
+
$billing['FirstName'] = $billingAddress->getFirstname();
|
324 |
+
$billing['LastName'] = $billingAddress->getLastname();
|
325 |
+
$billing['Phone'] = $billingAddress->getTelephone();
|
326 |
+
$billing['PostCode'] = $billingAddress->getPostcode();
|
327 |
+
$billing['Region'] = $billingAddress->getRegion();
|
328 |
+
$billing['Street1'] = $billingStreet[0];
|
329 |
+
if (array_key_exists(1, $billingStreet)) {
|
330 |
+
$billing['Street2'] = $billingStreet[1];
|
331 |
+
}
|
332 |
+
$addressInfo['Billing'] = $billing;
|
333 |
+
$shippingStreet = $shippingAddress->getStreet();
|
334 |
+
$shipping = array();
|
335 |
+
$shipping['City'] = $shippingAddress->getCity();
|
336 |
+
$shipping['CountryCode'] = $shippingAddress->getCountryId();
|
337 |
+
$shipping['Email'] = $order->getCustomerEmail();
|
338 |
+
$shipping['FirstName'] = $shippingAddress->getFirstname();
|
339 |
+
$shipping['LastName'] = $shippingAddress->getLastname();
|
340 |
+
$shipping['Phone'] = $shippingAddress->getTelephone();
|
341 |
+
$shipping['PostCode'] = $shippingAddress->getPostcode();
|
342 |
+
$shipping['Region'] = $shippingAddress->getRegion();
|
343 |
+
$shipping['Street1'] = $shippingStreet[0];
|
344 |
+
if (array_key_exists(1, $shippingStreet)) {
|
345 |
+
$shipping['Street2'] = $shippingStreet[1];
|
346 |
+
}
|
347 |
+
$addressInfo['Shipping'] = $shipping;
|
348 |
+
$addressInfo['ControlNumber'] = $order->getCpf();
|
349 |
+
$json['AddressInfo'] = $addressInfo;
|
350 |
+
$json['CurrencyCode'] = $order->getOrderCurrencyCode();
|
351 |
+
$json['DDP'] = true;
|
352 |
+
$shipmentItems = $shipment->getAllItems();
|
353 |
+
$itemsList = array();
|
354 |
+
foreach ($shipmentItems as $item) {
|
355 |
+
/** @var $item Mage_Sales_Model_Order_Shipment_Item */
|
356 |
+
// Check for a configurable product -- the simple should be loaded
|
357 |
+
/** @var $itemProduct Mage_Catalog_Model_Product */
|
358 |
+
$orderItem = $item->getOrderItem();
|
359 |
+
if ($orderItem->getProductType() == "configurable") {
|
360 |
+
$itemProduct = $orderItem->getChildrenItems();
|
361 |
+
$itemProduct = $itemProduct[0];
|
362 |
+
} else {
|
363 |
+
$itemProduct = Mage::getModel('catalog/product')->load($item->getOrderItem()->getProductId());
|
364 |
+
}
|
365 |
+
//get item price
|
366 |
+
$itemPrice = (float)$item->getFinalPrice() ?: (float)$item->getPrice();
|
367 |
+
// if not price and item has parent (is configurable)
|
368 |
+
if (!$itemPrice && ($parent=$item->getParentItem())) {
|
369 |
+
// get parent price
|
370 |
+
$itemPrice = (float)$parent->getFinalPrice() ?: (float)$parent->getPrice();
|
371 |
+
}
|
372 |
+
// if still not price
|
373 |
+
if (!$itemPrice) {
|
374 |
+
// get product price
|
375 |
+
$itemPrice = (float)$item->getProduct()->getPrice();
|
376 |
+
}
|
377 |
+
// if product isn't virtual and is configurable or downloadable
|
378 |
+
if ($item["is_virtual"] == false && !in_array($itemProduct->getTypeId(), array('configurable','downloadable'))) {
|
379 |
+
// add line item node
|
380 |
+
$lineItem = array();
|
381 |
+
$lineItem['SKU'] = $item->getSku();
|
382 |
+
$lineItem['CustWeightLbs'] = (float)$item->getWeight();
|
383 |
+
$lineItem['ValueUSD'] = $itemPrice;
|
384 |
+
$lineItem['CustLengthInches'] = (float)$item->getLength();
|
385 |
+
$lineItem['CustWidthInches'] = (float)$item->getWidth();
|
386 |
+
$lineItem['CustHeightInches'] = (float)$item->getHeight();
|
387 |
+
$lineItem['Quantity'] = (float)$item->getQty();
|
388 |
+
$lineItem['ValueShopperCurrency'] = $itemPrice;
|
389 |
+
$lineItem['ShopperCurrency'] = Mage::app()->getStore()->getCurrentCurrencyCode();
|
390 |
+
$itemsList[] = $lineItem;
|
391 |
+
}
|
392 |
+
}
|
393 |
+
$json['ItemDetailsList'] = $itemsList;
|
394 |
+
// if order_reference is set add it to request
|
395 |
+
if (Mage::getStoreConfig('carriers/iparcel/order_reference')) {
|
396 |
+
$json['OrderReference'] = $order->getIncrementId();
|
397 |
+
}
|
398 |
+
// Get discounts
|
399 |
+
$orderDiscountAmount = $order->getData('discount_amount');
|
400 |
+
$discount = 0;
|
401 |
+
if ($orderDiscountAmount != 0) {
|
402 |
+
$discount = -1 * $orderDiscountAmount;
|
403 |
+
}
|
404 |
+
// Get ServiceLevelID
|
405 |
+
$method = $order->getShippingMethod();
|
406 |
+
/* var $method string */
|
407 |
+
$method = explode('_', $method);
|
408 |
+
/* var $method array */
|
409 |
+
array_shift($method);
|
410 |
+
$serviceLevelId = implode('_', $method);
|
411 |
+
/* var $serviceLevelId string */
|
412 |
+
$json['OtherDiscount'] = $discount;
|
413 |
+
$json['OtherDiscountCurrency'] = $order->getOrderCurrencyCode();
|
414 |
+
$json['ServiceLevel'] = $serviceLevelId;
|
415 |
+
$json['SessionID'] = '';
|
416 |
+
$json['key'] = Mage::helper('iparcel')->getGuid();
|
417 |
+
$log->setRequest(json_encode($json));
|
418 |
+
$response = $this->_restJSON($json, $this->_submitParcel);
|
419 |
+
$log->setResponse($response);
|
420 |
+
$log->save();
|
421 |
+
return json_decode($response);
|
422 |
+
}
|
423 |
+
|
424 |
+
/**
|
425 |
+
* Split a shipment via web service API
|
426 |
+
*
|
427 |
+
* @param Mage_Sales_Model_Order_Shipment $shipment
|
428 |
+
* @param array $itemCollection Items to split into separate shipment
|
429 |
+
* @return Object
|
430 |
+
*/
|
431 |
+
public function splitShipment(Mage_Sales_Model_Order_Shipment $shipment, $itemCollection)
|
432 |
+
{
|
433 |
+
if (count($itemCollection) < 1) {
|
434 |
+
Mage::throwException(
|
435 |
+
'Failed when splitting shipment: Item count must be greater than 0'
|
436 |
+
);
|
437 |
+
}
|
438 |
+
|
439 |
+
$json = array();
|
440 |
+
$json['TrackingNumber'] = Mage::helper('iparcel')->getTrackingNumber($shipment);
|
441 |
+
$json['SkuList'] = array();
|
442 |
+
$json['Key'] = Mage::helper('iparcel')->getGuid();
|
443 |
+
|
444 |
+
$items = array();
|
445 |
+
foreach ($itemCollection as $item) {
|
446 |
+
$items['Sku'] = $item['sku'];
|
447 |
+
$items['Quantity'] = $item['qty'];
|
448 |
+
$json['SkuList'][] = $items;
|
449 |
+
}
|
450 |
+
|
451 |
+
$response = $this->_restJSON($json, $this->_split);
|
452 |
+
|
453 |
+
$log = Mage::getModel('iparcel/log');
|
454 |
+
$log->setController('Split Shipment');
|
455 |
+
$log->setRequest(json_encode($json));
|
456 |
+
$log->setResponse($response);
|
457 |
+
$log->save();
|
458 |
+
|
459 |
+
$response = json_decode($response);
|
460 |
+
|
461 |
+
if (is_array($response) && count($response) == 2) {
|
462 |
+
// Delete old shipment, create two new ones.
|
463 |
+
|
464 |
+
$order = $shipment->getOrder();
|
465 |
+
$orderItems = $order->getAllItems();
|
466 |
+
|
467 |
+
// Split the order items into two arrays, one for each new shipment
|
468 |
+
$firstItems = array();
|
469 |
+
$secondItems = array();
|
470 |
+
foreach($orderItems as $orderItem) {
|
471 |
+
foreach($itemCollection as $item) {
|
472 |
+
if ($orderItem->getSku() == $item['sku']) {
|
473 |
+
$firstItems[$orderItem->getId()] = $item['qty'];
|
474 |
+
$secondItems[$orderItem->getId()] = $orderItem->getQtyOrdered() - $item['qty'];
|
475 |
+
} else {
|
476 |
+
$secondItems[$orderItem->getId()] = $orderItem->getQtyOrdered();
|
477 |
+
}
|
478 |
+
}
|
479 |
+
}
|
480 |
+
|
481 |
+
// Delete the original shipment
|
482 |
+
$shipment->delete();
|
483 |
+
$items = $order->getAllVisibleItems();
|
484 |
+
foreach($items as $item){
|
485 |
+
$item->setQtyShipped(0);
|
486 |
+
$item->save();
|
487 |
+
}
|
488 |
+
|
489 |
+
Mage::register('iparcel_skip_auto_submit', true);
|
490 |
+
// Create a new shipment for each set of items
|
491 |
+
$firstShipment = Mage::getModel('sales/order_shipment_api')->create(
|
492 |
+
$order->getIncrementId(),
|
493 |
+
$firstItems,
|
494 |
+
null,
|
495 |
+
false,
|
496 |
+
false
|
497 |
+
);
|
498 |
+
Mage::getModel('sales/order_shipment_api')->addTrack(
|
499 |
+
$firstShipment,
|
500 |
+
$order->getShippingCarrier()->getCarrierCode(),
|
501 |
+
'I-Parcel',
|
502 |
+
$response[0]
|
503 |
+
);
|
504 |
+
|
505 |
+
$secondShipment = Mage::getModel('sales/order_shipment_api')->create(
|
506 |
+
$order->getIncrementId(),
|
507 |
+
$secondItems,
|
508 |
+
null,
|
509 |
+
false,
|
510 |
+
false
|
511 |
+
);
|
512 |
+
Mage::getModel('sales/order_shipment_api')->addTrack(
|
513 |
+
$secondShipment,
|
514 |
+
$order->getShippingCarrier()->getCarrierCode(),
|
515 |
+
'I-Parcel',
|
516 |
+
$response[1]
|
517 |
+
);
|
518 |
+
Mage::unregister('iparcel_skip_auto_submit');
|
519 |
+
} else {
|
520 |
+
Mage::throwException(
|
521 |
+
'Failed when splitting shipment.'
|
522 |
+
);
|
523 |
+
}
|
524 |
+
|
525 |
+
return true;
|
526 |
+
}
|
527 |
+
|
528 |
/**
|
529 |
* Prepare product collection for SubmitCatalog calls
|
530 |
*
|
app/code/community/Iparcel/All/Helper/Data.php
CHANGED
@@ -27,4 +27,272 @@ class Iparcel_All_Helper_Data extends Mage_Core_Helper_Abstract
|
|
27 |
{
|
28 |
return Mage::getStoreConfig('iparcel/config/custid');
|
29 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
30 |
}
|
27 |
{
|
28 |
return Mage::getStoreConfig('iparcel/config/custid');
|
29 |
}
|
30 |
+
|
31 |
+
/**
|
32 |
+
* Getting external JS Scripts URL
|
33 |
+
*
|
34 |
+
* @return string
|
35 |
+
*/
|
36 |
+
public function getScriptUrl()
|
37 |
+
{
|
38 |
+
return '//script.i-parcel.com/';
|
39 |
+
}
|
40 |
+
|
41 |
+
/**
|
42 |
+
* Escape quotation mark in strings for inclusion in JavaScript objects
|
43 |
+
*
|
44 |
+
* @param string $string String to escape
|
45 |
+
* @return string
|
46 |
+
*/
|
47 |
+
public function jsEscape($string = '')
|
48 |
+
{
|
49 |
+
return addcslashes($string, "\"");
|
50 |
+
}
|
51 |
+
|
52 |
+
/**
|
53 |
+
* Finds the tracking number of a Magento shipment
|
54 |
+
*
|
55 |
+
* @param Mage_Sales_Model_Order_Shipment $shipment
|
56 |
+
* @return string
|
57 |
+
*/
|
58 |
+
public function getTrackingNumber(Mage_Sales_Model_Order_Shipment $shipment)
|
59 |
+
{
|
60 |
+
$trackingNumber = '';
|
61 |
+
$tracks = $shipment->getAllTracks();
|
62 |
+
|
63 |
+
if (array_key_exists(0, $tracks)) {
|
64 |
+
$trackingNumber = $tracks[0]->getTrackNumber();
|
65 |
+
}
|
66 |
+
|
67 |
+
return $trackingNumber;
|
68 |
+
}
|
69 |
+
|
70 |
+
/**
|
71 |
+
* Determines if the current shipping rate request is International.
|
72 |
+
*
|
73 |
+
* "International" is determined by the store's Shipping Settings "Origin"
|
74 |
+
* country. This can be overridden in the i-parcel Shipping Method settings.
|
75 |
+
*
|
76 |
+
* @param Mage_Shipping_Model_Rate_Request $request
|
77 |
+
* @return boolean
|
78 |
+
*/
|
79 |
+
public function getIsInternational(Mage_Shipping_Model_Rate_Request $request)
|
80 |
+
{
|
81 |
+
$isInternational = false;
|
82 |
+
$originCountryId = $this->_getOriginCountry();
|
83 |
+
$destinationCountryId = $request->getDestCountryId();
|
84 |
+
if ($originCountryId !== $destinationCountryId) {
|
85 |
+
$isInternational = true;
|
86 |
+
}
|
87 |
+
return $isInternational;
|
88 |
+
}
|
89 |
+
|
90 |
+
/**
|
91 |
+
* Determines if an order is an i-parcel order
|
92 |
+
*
|
93 |
+
* @param Mage_Sales_Model_Order $order
|
94 |
+
* @return bool
|
95 |
+
*/
|
96 |
+
public function isIparcelOrder(Mage_Sales_Model_Order $order)
|
97 |
+
{
|
98 |
+
$iparcelCarrier = Mage::getModel('iplogistics/carrier_iparcel');
|
99 |
+
|
100 |
+
$carrier = $order->getShippingCarrier();
|
101 |
+
|
102 |
+
if (is_null($carrier) || $carrier == false) {
|
103 |
+
$method = $order->getShippingMethod();
|
104 |
+
if (preg_match('/^iparcel.*/', $method)) {
|
105 |
+
return true;
|
106 |
+
}
|
107 |
+
return false;
|
108 |
+
}
|
109 |
+
|
110 |
+
if ($carrier->getCarrierCode() == $iparcelCarrier->getCarrierCode()) {
|
111 |
+
return true;
|
112 |
+
}
|
113 |
+
|
114 |
+
return false;
|
115 |
+
}
|
116 |
+
|
117 |
+
/**
|
118 |
+
* Returns the admin URL to cancel a shipment
|
119 |
+
*
|
120 |
+
* @param string $shipment ID of shipment to cancel.
|
121 |
+
* @return string
|
122 |
+
*/
|
123 |
+
public function getShipmentCancelUrl($shipment)
|
124 |
+
{
|
125 |
+
return Mage::helper('adminhtml')->getUrl(
|
126 |
+
'adminhtml/iparcel_shipment/cancel',
|
127 |
+
array('shipment' => $shipment)
|
128 |
+
);
|
129 |
+
}
|
130 |
+
/**
|
131 |
+
* Returns the admin URL to split a shipment
|
132 |
+
*
|
133 |
+
* @param string $shipment ID of shipment to split.
|
134 |
+
* @return string
|
135 |
+
*/
|
136 |
+
public function getShipmentSplitUrl($shipment)
|
137 |
+
{
|
138 |
+
return Mage::helper('adminhtml')->getUrl(
|
139 |
+
'adminhtml/iparcel_shipment/split',
|
140 |
+
array('shipment' => $shipment)
|
141 |
+
);
|
142 |
+
}
|
143 |
+
/**
|
144 |
+
* Returns the total count of all items on a shipment
|
145 |
+
*
|
146 |
+
* @param $shipment Shipment ID or Mage_Sales_Model_Order_Shipment object to count
|
147 |
+
* @return string
|
148 |
+
*/
|
149 |
+
public function getShipmentItemCount($shipment)
|
150 |
+
{
|
151 |
+
if (!is_object($shipment)) {
|
152 |
+
$shipment = Mage::getModel('sales/order_shipment')->load($shipment);
|
153 |
+
}
|
154 |
+
$qty = 0;
|
155 |
+
$items = $shipment->getAllItems();
|
156 |
+
foreach ($items as $item) {
|
157 |
+
$qty += $item->getQty();
|
158 |
+
}
|
159 |
+
return $qty;
|
160 |
+
}
|
161 |
+
|
162 |
+
|
163 |
+
/**
|
164 |
+
* Retrieve Service Levels from the database
|
165 |
+
*
|
166 |
+
* @return array Array of [ServiceLevel] => Title
|
167 |
+
*/
|
168 |
+
public function getServiceLevels()
|
169 |
+
{
|
170 |
+
$serviceLevels = unserialize(Mage::getStoreConfig('carriers/iparcel/name'));
|
171 |
+
$formatted = array();
|
172 |
+
foreach ($serviceLevels as $level) {
|
173 |
+
$formatted[$level['service_id']] = $level['title'];
|
174 |
+
}
|
175 |
+
return $formatted;
|
176 |
+
}
|
177 |
+
|
178 |
+
/**
|
179 |
+
* Finds the Origin country as configured in the Magento admin.
|
180 |
+
*
|
181 |
+
* @return string Two-letter Country Code
|
182 |
+
*/
|
183 |
+
private function _getOriginCountry()
|
184 |
+
{
|
185 |
+
// If the admin has chose to select a different "origin" country
|
186 |
+
if (Mage::getStoreConfig('carriers/iparcel/choose_domestic')) {
|
187 |
+
return Mage::getStoreConfig('carriers/iparcel/origin_country_id');
|
188 |
+
}
|
189 |
+
return Mage::getStoreConfig('shipping/origin/country_id');
|
190 |
+
}
|
191 |
+
|
192 |
+
/**
|
193 |
+
* Helper method to find the value of the tax intercepting mode
|
194 |
+
*
|
195 |
+
* @return boolean
|
196 |
+
*/
|
197 |
+
public function getDisplayTaxAndDutyCumulatively()
|
198 |
+
{
|
199 |
+
return Mage::getStoreConfig('iparcel/tax/mode') == Iparcel_All_Model_System_Config_Source_Tax_Mode::CUMULATIVELY;
|
200 |
+
}
|
201 |
+
/**
|
202 |
+
* Helper method to find the value of the tax intercepting mode
|
203 |
+
*
|
204 |
+
* @return boolean
|
205 |
+
*/
|
206 |
+
public function getDisplayTaxAndDutySeparately()
|
207 |
+
{
|
208 |
+
return Mage::getStoreConfig('iparcel/tax/mode') == Iparcel_All_Model_System_Config_Source_Tax_Mode::SEPARATELY;
|
209 |
+
}
|
210 |
+
/**
|
211 |
+
* Return the Admin user created "Tax" Label
|
212 |
+
*
|
213 |
+
* @return string
|
214 |
+
*/
|
215 |
+
public function getTaxLabel()
|
216 |
+
{
|
217 |
+
$taxLabel = Mage::getStoreConfig('iparcel/tax/tax_label');
|
218 |
+
if ($taxLabel == '') {
|
219 |
+
return Mage::helper('iparcel')->__('Tax');
|
220 |
+
} else {
|
221 |
+
return $taxLabel;
|
222 |
+
}
|
223 |
+
}
|
224 |
+
/**
|
225 |
+
* Return the Admin user created "Duty" Label
|
226 |
+
*
|
227 |
+
* @return string
|
228 |
+
*/
|
229 |
+
public function getDutyLabel()
|
230 |
+
{
|
231 |
+
$dutyLabel = Mage::getStoreConfig('iparcel/tax/duty_label');
|
232 |
+
if ($dutyLabel == '') {
|
233 |
+
return Mage::helper('iparcel')->__('Duty');
|
234 |
+
} else {
|
235 |
+
return $dutyLabel;
|
236 |
+
}
|
237 |
+
}
|
238 |
+
/**
|
239 |
+
* Return the Admin user created "Tax And Duty" Label
|
240 |
+
*
|
241 |
+
* @return string
|
242 |
+
*/
|
243 |
+
public function getTaxAndDutyLabel()
|
244 |
+
{
|
245 |
+
$taxAndDutyLabel = Mage::getStoreConfig('iparcel/tax/tax_duty_label');
|
246 |
+
if ($taxAndDutyLabel == '') {
|
247 |
+
return Mage::helper('iparcel')->__('Tax & Duty');
|
248 |
+
} else {
|
249 |
+
return $taxAndDutyLabel;
|
250 |
+
}
|
251 |
+
}
|
252 |
+
|
253 |
+
/**
|
254 |
+
* Returns the installed status of Iparcel_CartHandoff
|
255 |
+
*
|
256 |
+
* @return bool
|
257 |
+
*/
|
258 |
+
public function isCartHandoffInstalled()
|
259 |
+
{
|
260 |
+
return $this->_isExtensionInstalled('Iparcel_CartHandoff');
|
261 |
+
}
|
262 |
+
|
263 |
+
/**
|
264 |
+
* Returns the installed status of Iparcel_GlobaleCommerce
|
265 |
+
*
|
266 |
+
* @return bool
|
267 |
+
*/
|
268 |
+
public function isGlobaleCommerceInstalled()
|
269 |
+
{
|
270 |
+
return $this->_isExtensionInstalled('Iparcel_GlobaleCommerce');
|
271 |
+
}
|
272 |
+
|
273 |
+
/**
|
274 |
+
* Returns the installed status of Iparcel_Logistics
|
275 |
+
*
|
276 |
+
* @return bool
|
277 |
+
*/
|
278 |
+
public function isLogisticsInstalled()
|
279 |
+
{
|
280 |
+
return $this->_isExtensionInstalled('Iparcel_Logistics');
|
281 |
+
}
|
282 |
+
|
283 |
+
/**
|
284 |
+
* Finds if an extension is installed
|
285 |
+
*
|
286 |
+
* @param string $name
|
287 |
+
* @return bool
|
288 |
+
*/
|
289 |
+
private function _isExtensionInstalled($name)
|
290 |
+
{
|
291 |
+
if ($name == '') {
|
292 |
+
return false;
|
293 |
+
}
|
294 |
+
|
295 |
+
$allExtensions = Mage::app()->getConfig()->getNode('modules')->asArray();
|
296 |
+
return array_key_exists($name, $allExtensions);
|
297 |
+
}
|
298 |
}
|
app/code/community/Iparcel/All/Helper/International.php
ADDED
@@ -0,0 +1,62 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* i-parcel international customer helper
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Helper_International
|
10 |
+
{
|
11 |
+
/**
|
12 |
+
* Get international flag from customer session
|
13 |
+
*
|
14 |
+
* @return bool
|
15 |
+
*/
|
16 |
+
public function getInternational()
|
17 |
+
{
|
18 |
+
return Mage::getSingleton('checkout/session')->getInternationalFlag();
|
19 |
+
}
|
20 |
+
|
21 |
+
/**
|
22 |
+
* Set international flag to customer session, respond with new state
|
23 |
+
*
|
24 |
+
* @param bool $v
|
25 |
+
* @return bool
|
26 |
+
*/
|
27 |
+
public function setInternational($v)
|
28 |
+
{
|
29 |
+
Mage::getSingleton('checkout/session')->setInternationalFlag($v);
|
30 |
+
return Mage::getSingleton('checkout/session')->getInternationalFlag();
|
31 |
+
}
|
32 |
+
|
33 |
+
/**
|
34 |
+
* Checking if international customer is enabled
|
35 |
+
*
|
36 |
+
* @return bool
|
37 |
+
*/
|
38 |
+
public function checkEnabled()
|
39 |
+
{
|
40 |
+
return Mage::getStoreConfigFlag('iparcel/international_customer/enable');
|
41 |
+
}
|
42 |
+
|
43 |
+
/**
|
44 |
+
* Get international visibility attribute ID
|
45 |
+
*
|
46 |
+
* @return string
|
47 |
+
*/
|
48 |
+
public function getVisibilityAttributeId()
|
49 |
+
{
|
50 |
+
return Mage::getStoreConfig('iparcel/international_customer/visibility');
|
51 |
+
}
|
52 |
+
|
53 |
+
/**
|
54 |
+
* Get international visibility attribute name
|
55 |
+
*
|
56 |
+
* @return string
|
57 |
+
*/
|
58 |
+
public function getVisibilityAttributeName()
|
59 |
+
{
|
60 |
+
return Mage::getModel('catalog/resource_eav_attribute')->load($this->getVisibilityAttributeId())->getName();
|
61 |
+
}
|
62 |
+
}
|
app/code/community/Iparcel/{Logistics → All}/Model/Api/Quote.php
RENAMED
@@ -3,24 +3,24 @@
|
|
3 |
* Model for retrieving stored shipping quotes from the database
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
/**
|
12 |
* Initialize resource model
|
13 |
*/
|
14 |
protected function _construct()
|
15 |
{
|
16 |
-
$this->_init('
|
17 |
}
|
18 |
|
19 |
/**
|
20 |
* Loads quote from database by Magento Quote ID
|
21 |
*
|
22 |
* @param int $quote_id
|
23 |
-
* @return
|
24 |
*/
|
25 |
public function loadByQuoteId($quote_id)
|
26 |
{
|
@@ -32,7 +32,7 @@ class Iparcel_Logistics_Model_Api_Quote extends Mage_Core_Model_Abstract
|
|
32 |
* Setter for serviceLevels
|
33 |
*
|
34 |
* @param array serviceLevels
|
35 |
-
* @return
|
36 |
*/
|
37 |
public function setServiceLevels($serviceLevels)
|
38 |
{
|
3 |
* Model for retrieving stored shipping quotes from the database
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Model_Api_Quote extends Mage_Core_Model_Abstract
|
10 |
{
|
11 |
/**
|
12 |
* Initialize resource model
|
13 |
*/
|
14 |
protected function _construct()
|
15 |
{
|
16 |
+
$this->_init('iparcel/api_quote');
|
17 |
}
|
18 |
|
19 |
/**
|
20 |
* Loads quote from database by Magento Quote ID
|
21 |
*
|
22 |
* @param int $quote_id
|
23 |
+
* @return Iparcel_All_Model_Api_Quote
|
24 |
*/
|
25 |
public function loadByQuoteId($quote_id)
|
26 |
{
|
32 |
* Setter for serviceLevels
|
33 |
*
|
34 |
* @param array serviceLevels
|
35 |
+
* @return Iparcel_All_Model_Api_Quote
|
36 |
*/
|
37 |
public function setServiceLevels($serviceLevels)
|
38 |
{
|
app/code/community/Iparcel/All/Model/Carrier/Iparcel.php
ADDED
@@ -0,0 +1,163 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* i-parcel shipping method model
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Model_Carrier_Iparcel extends Mage_Shipping_Model_Carrier_Abstract implements Mage_Shipping_Model_Carrier_Interface
|
10 |
+
{
|
11 |
+
protected $_code = 'iparcel';
|
12 |
+
|
13 |
+
protected $_trackingUrl = 'https://tracking.i-parcel.com/secure/track.aspx?track=';
|
14 |
+
|
15 |
+
/**
|
16 |
+
* Check if carrier has shipping label option available
|
17 |
+
*
|
18 |
+
* @return bool
|
19 |
+
*/
|
20 |
+
public function isShippingLabelsAvailable()
|
21 |
+
{
|
22 |
+
return true;
|
23 |
+
}
|
24 |
+
|
25 |
+
/**
|
26 |
+
* Check if carrier has shipping tracking option available
|
27 |
+
*
|
28 |
+
* @return bool
|
29 |
+
*/
|
30 |
+
public function isTrackingAvailable()
|
31 |
+
{
|
32 |
+
return true;
|
33 |
+
}
|
34 |
+
|
35 |
+
/**
|
36 |
+
* Get info for track order page
|
37 |
+
*
|
38 |
+
* @param string $number Tracking Number
|
39 |
+
* @return Varien_Object
|
40 |
+
*/
|
41 |
+
public function getTrackingInfo($number)
|
42 |
+
{
|
43 |
+
return new Varien_Object(array(
|
44 |
+
'tracking' => $number,
|
45 |
+
'carrier_title' => $this->getConfigData('title'),
|
46 |
+
'url' => $this->_trackingUrl.$number
|
47 |
+
));
|
48 |
+
}
|
49 |
+
|
50 |
+
/**
|
51 |
+
* Return container types of carrier
|
52 |
+
*
|
53 |
+
* @return array
|
54 |
+
*/
|
55 |
+
public function getContainerTypes(Varien_Object $params = null)
|
56 |
+
{
|
57 |
+
return array('DEFAULT' => Mage::helper('iparcel')->__('Default box'));
|
58 |
+
}
|
59 |
+
|
60 |
+
/**
|
61 |
+
* Collect shipping rates for i-parcel shipping
|
62 |
+
* refactor: add result check, add intermediate storage for parcel_id
|
63 |
+
*
|
64 |
+
* @param Mage_Shipping_Model_Rate_Request $request
|
65 |
+
* @return Mage_Shipping_Model_Rate_Result|bool
|
66 |
+
*/
|
67 |
+
public function collectRates(Mage_Shipping_Model_Rate_Request $request)
|
68 |
+
{
|
69 |
+
try {
|
70 |
+
/** @var boolean $internationalOrder */
|
71 |
+
$internationalOrder = Mage::helper('iparcel')->getIsInternational($request);
|
72 |
+
if ($internationalOrder && Mage::getStoreConfig('carriers/iparcel/active')) {
|
73 |
+
/** @var array $iparcel Tax & Duty totals */
|
74 |
+
$iparcelTaxAndDuty = array();
|
75 |
+
/** @var Mage_Shipping_Model_Rate_Result $result*/
|
76 |
+
$result = Mage::getModel('shipping/rate_result');
|
77 |
+
// Get Allowed Methods
|
78 |
+
/** @var array $allowed_methods Shipping method allowed via admin config "names" */
|
79 |
+
$allowed_methods = $this->getAllowedMethods();
|
80 |
+
/** @var stdClass $quote */
|
81 |
+
$quote = Mage::helper('iparcel/api')->quote($request);
|
82 |
+
$iparcelTaxAndDuty['parcel_id'] = $quote->ParcelID;
|
83 |
+
$serviceLevel = new stdClass;
|
84 |
+
if (isset($quote->ServiceLevels)) {
|
85 |
+
$serviceLevel = $quote->ServiceLevels;
|
86 |
+
}
|
87 |
+
// Handling serviceLevels results and set up the shipping method
|
88 |
+
foreach ($serviceLevel as $ci) {
|
89 |
+
// setting up values
|
90 |
+
$servicename = @$ci->ServiceLevelID;
|
91 |
+
$duty = (float)@$ci->DutyCompanyCurrency;
|
92 |
+
$tax = (float)@$ci->TaxCompanyCurrency;
|
93 |
+
$shipping = (float)@$ci->ShippingChargeCompanyCurrency;
|
94 |
+
$tax_flag = Mage::getStoreConfig('iparcel/tax/mode') == Iparcel_All_Model_System_Config_Source_Tax_Mode::DISABLED
|
95 |
+
|| $request->getDestCountryId() == $request->getCountryId();
|
96 |
+
// true if tax intercepting is disabled
|
97 |
+
$total = $tax_flag ? (float)($duty + $tax + $shipping) : (float)$shipping;
|
98 |
+
if (!isset($allowed_methods[$servicename])) {
|
99 |
+
continue;
|
100 |
+
}
|
101 |
+
$shiplabel = $allowed_methods[$servicename];
|
102 |
+
$title = $shiplabel;
|
103 |
+
if ($tax_flag) {
|
104 |
+
$title = Mage::helper('iparcel')->__(
|
105 |
+
'%s (Shipping Price: %s Duty: %s Tax: %s)',
|
106 |
+
$shiplabel,
|
107 |
+
$this->_formatPrice($shipping),
|
108 |
+
$this->_formatPrice($duty),
|
109 |
+
$this->_formatPrice($tax)
|
110 |
+
);
|
111 |
+
}
|
112 |
+
$method = Mage::getModel('shipping/rate_result_method');
|
113 |
+
$method->setCarrier($this->_code);
|
114 |
+
$method->setCarrierTitle($this->getConfigData('title'));
|
115 |
+
$method->setMethod($servicename);
|
116 |
+
$method->setMethodTitle($title);
|
117 |
+
$method->setPrice($total);
|
118 |
+
$method->setCost($total);
|
119 |
+
// append method to result
|
120 |
+
$result->append($method);
|
121 |
+
$iparcelTaxAndDuty['service_levels'][$this->_code . '_' . $servicename] = array(
|
122 |
+
'duty' => $duty,
|
123 |
+
'tax' => $tax
|
124 |
+
);
|
125 |
+
}
|
126 |
+
// Store the shipping quote
|
127 |
+
$quoteId = Mage::getModel('checkout/cart')->getQuote()->getId();
|
128 |
+
$quote = Mage::getModel('iparcel/api_quote');
|
129 |
+
$quote->loadByQuoteId($quoteId);
|
130 |
+
$quote->setQuoteId($quoteId);
|
131 |
+
$quote->setParcelId($iparcelTaxAndDuty['parcel_id']);
|
132 |
+
$quote->setServiceLevels($iparcelTaxAndDuty['service_levels']);
|
133 |
+
$quote->save();
|
134 |
+
return $result;
|
135 |
+
}
|
136 |
+
} catch (Exception $e) {
|
137 |
+
Mage::logException($e);
|
138 |
+
}
|
139 |
+
return false;
|
140 |
+
}
|
141 |
+
|
142 |
+
|
143 |
+
public function getMethodsNames()
|
144 |
+
{
|
145 |
+
$names = array();
|
146 |
+
$raw = $this->getConfigData('name');
|
147 |
+
$raw = unserialize($raw);
|
148 |
+
foreach ($raw as $method) {
|
149 |
+
$names[$method['service_id']] = $method['title'];
|
150 |
+
}
|
151 |
+
return $names;
|
152 |
+
}
|
153 |
+
|
154 |
+
/**
|
155 |
+
* Get Allowed Shipping Methods
|
156 |
+
*
|
157 |
+
* @return array
|
158 |
+
*/
|
159 |
+
public function getAllowedMethods()
|
160 |
+
{
|
161 |
+
return $this->getMethodsNames();
|
162 |
+
}
|
163 |
+
}
|
app/code/community/Iparcel/All/Model/Config/Script/Js.php
ADDED
@@ -0,0 +1,94 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Backend model for JavaScript file config field
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Model_Config_Script_Js extends Mage_Adminhtml_Model_System_Config_Backend_File
|
10 |
+
{
|
11 |
+
const UPLOAD_ROOT = 'js';
|
12 |
+
const UPLOAD_DIR = 'iparcel_custom';
|
13 |
+
|
14 |
+
/**
|
15 |
+
* Method called before config save
|
16 |
+
* Unlinking old or deleted file
|
17 |
+
*/
|
18 |
+
protected function _beforeSave()
|
19 |
+
{
|
20 |
+
$uploadDir = $this->_getUploadDir();
|
21 |
+
|
22 |
+
$file = $uploadDir.'/'.$this->getValue();
|
23 |
+
|
24 |
+
// if it's delete action and file exists
|
25 |
+
if ($delete && file_exists($file)) {
|
26 |
+
unlink($file);
|
27 |
+
}
|
28 |
+
|
29 |
+
// if it's set new action and old file exists
|
30 |
+
$file = $uploadDir.'/'. $_FILES['groups']['name'][$this->getGroupId()]['fields'][$this->getField()]['value'];
|
31 |
+
if (file_exists($file)) {
|
32 |
+
unlink($file);
|
33 |
+
}
|
34 |
+
parent::_beforeSave();
|
35 |
+
}
|
36 |
+
|
37 |
+
/**
|
38 |
+
* Getting directory where scripts are uploaded
|
39 |
+
*
|
40 |
+
* @param string $field
|
41 |
+
* @return string
|
42 |
+
*/
|
43 |
+
public function getUploadDir($field)
|
44 |
+
{
|
45 |
+
$uploadDir = self::UPLOAD_DIR;
|
46 |
+
|
47 |
+
$uploadDir = $uploadDir.'/'.$field. '/';
|
48 |
+
return $uploadDir;
|
49 |
+
}
|
50 |
+
|
51 |
+
/**
|
52 |
+
* Getting directory wher to upload
|
53 |
+
*
|
54 |
+
* @return string
|
55 |
+
*/
|
56 |
+
protected function _getUploadDir()
|
57 |
+
{
|
58 |
+
$uploadRoot = $this->_getUploadRoot(self::UPLOAD_ROOT);
|
59 |
+
$uploadDir = $this->_appendScopeInfo(self::UPLOAD_DIR.'/'.$this->getField());
|
60 |
+
|
61 |
+
$uploadDir = $uploadRoot .'/'. $uploadDir;
|
62 |
+
return $uploadDir;
|
63 |
+
}
|
64 |
+
|
65 |
+
/**
|
66 |
+
* Returning if scope info should be added
|
67 |
+
*
|
68 |
+
* @return bool
|
69 |
+
*/
|
70 |
+
protected function _addWhetherScopeInfo()
|
71 |
+
{
|
72 |
+
return true;
|
73 |
+
}
|
74 |
+
|
75 |
+
/**
|
76 |
+
* Returning array of proper extensions
|
77 |
+
*
|
78 |
+
* @return array
|
79 |
+
*/
|
80 |
+
protected function _getAllowedExtensions()
|
81 |
+
{
|
82 |
+
return array('js');
|
83 |
+
}
|
84 |
+
|
85 |
+
/**
|
86 |
+
* Getting upload root directory
|
87 |
+
*
|
88 |
+
* @return string
|
89 |
+
*/
|
90 |
+
protected function _getUploadRoot($token)
|
91 |
+
{
|
92 |
+
return Mage::getBaseDir()."/$token";
|
93 |
+
}
|
94 |
+
}
|
app/code/community/Iparcel/All/Model/Log.php
CHANGED
@@ -6,158 +6,13 @@
|
|
6 |
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class Iparcel_All_Model_Log extends
|
10 |
{
|
11 |
-
const LOG_FILENAME = "iparcel.log";
|
12 |
-
const MAX_LOG_SIZE = 10;
|
13 |
-
|
14 |
-
protected $_jsonData;
|
15 |
-
|
16 |
/**
|
17 |
-
*
|
18 |
*/
|
19 |
protected function _construct()
|
20 |
{
|
21 |
-
$this->
|
22 |
-
$this->setJson($this->_read());
|
23 |
-
}
|
24 |
-
|
25 |
-
/**
|
26 |
-
* Read log file method
|
27 |
-
*
|
28 |
-
* @return Varien_Data_Collection
|
29 |
-
*/
|
30 |
-
protected function _read()
|
31 |
-
{
|
32 |
-
$response = new Varien_Data_Collection();
|
33 |
-
|
34 |
-
if (!file_exists($this->getLogFilename())) {
|
35 |
-
$this->_jsonData = array();
|
36 |
-
return $response;
|
37 |
-
}
|
38 |
-
|
39 |
-
$file = fopen($this->getLogFilename(), "r");
|
40 |
-
$this->_jsonData = json_decode(fread($file, filesize($this->getLogFilename())), true);
|
41 |
-
fclose($file);
|
42 |
-
|
43 |
-
if (!is_array($this->_jsonData)) {
|
44 |
-
if (!$this->_clear()) {
|
45 |
-
Mage::throwException(Mage::helper('iparcel')->__('Access Forbidden for i-parcel log file'));
|
46 |
-
}
|
47 |
-
$this->_jsonData = array();
|
48 |
-
return $response;
|
49 |
-
}
|
50 |
-
|
51 |
-
// for each json log node append Varien Object to Varien Data Collection
|
52 |
-
foreach ($this->_jsonData['logs'] as $log) {
|
53 |
-
$_log = new Varien_Object(array(
|
54 |
-
'timestamp' => $log['Timestamp'],
|
55 |
-
'controller' => $log['Controller'],
|
56 |
-
'response' => $log['Response'],
|
57 |
-
'request' => $log['Request']
|
58 |
-
));
|
59 |
-
$response->addItem($_log);
|
60 |
-
}
|
61 |
-
return $response;
|
62 |
-
}
|
63 |
-
|
64 |
-
/**
|
65 |
-
* Internal save method
|
66 |
-
*
|
67 |
-
* @return bool
|
68 |
-
*/
|
69 |
-
protected function _save()
|
70 |
-
{
|
71 |
-
try {
|
72 |
-
$file = fopen($this->getLogFilename(), 'w');
|
73 |
-
fwrite($file, json_encode($this->_jsonData));
|
74 |
-
fclose($file);
|
75 |
-
return true;
|
76 |
-
} catch (Exception $e) {
|
77 |
-
return false;
|
78 |
-
}
|
79 |
-
}
|
80 |
-
|
81 |
-
/**
|
82 |
-
* Internal create JSON file method
|
83 |
-
*
|
84 |
-
* @return bool
|
85 |
-
*/
|
86 |
-
protected function _create()
|
87 |
-
{
|
88 |
-
$this->_jsonData['created'] = $this->getTimestamp();
|
89 |
-
$this->_jsonData['edited'] = $this->getTimestamp();
|
90 |
-
$this->_jsonData['logs'] = array();
|
91 |
-
|
92 |
-
$this->_appendLog();
|
93 |
-
return $this->_save();
|
94 |
-
}
|
95 |
-
|
96 |
-
/**
|
97 |
-
* Internal append XML to file method
|
98 |
-
*
|
99 |
-
* @return bool
|
100 |
-
*/
|
101 |
-
protected function _append()
|
102 |
-
{
|
103 |
-
$this->_jsonData['edited'] = $this->getTimestamp();
|
104 |
-
|
105 |
-
$this->_appendLog();
|
106 |
-
return $this->_save();
|
107 |
-
}
|
108 |
-
|
109 |
-
/**
|
110 |
-
* Internal clear XML file method
|
111 |
-
*
|
112 |
-
* @return bool
|
113 |
-
*/
|
114 |
-
protected function _clear()
|
115 |
-
{
|
116 |
-
return unlink($this->getLogFilename());
|
117 |
-
}
|
118 |
-
|
119 |
-
/**
|
120 |
-
* Internal append log nodes to SimpleXMLExtended object
|
121 |
-
*/
|
122 |
-
protected function _appendLog()
|
123 |
-
{
|
124 |
-
$log = array();
|
125 |
-
$log['Timestamp'] = $this->getTimestamp();
|
126 |
-
$log['Controller'] = $this->getController();
|
127 |
-
$log['Request'] = $this->getRequest();
|
128 |
-
$log['Response'] = $this->getResponse();
|
129 |
-
|
130 |
-
$this->_jsonData['logs'][] = $log;
|
131 |
-
if (self::MAX_LOG_SIZE < count($this->_jsonData['logs'])) {
|
132 |
-
array_shift($this->_jsonData['logs']);
|
133 |
-
}
|
134 |
-
}
|
135 |
-
|
136 |
-
/**
|
137 |
-
* Save log file method
|
138 |
-
*
|
139 |
-
* @return bool
|
140 |
-
*/
|
141 |
-
public function save()
|
142 |
-
{
|
143 |
-
$this->setTimestamp(date('d/m/Y h:i:sA T'));
|
144 |
-
$_request = $this->getRequest();
|
145 |
-
$_response = $this->getResponse();
|
146 |
-
$_controller = $this->getController();
|
147 |
-
if (!($_request !== null && $_response !== null && $_controller)) {
|
148 |
-
Mage::throwException(Mage::helper('iparcel')->__('Log data is not filled'));
|
149 |
-
}
|
150 |
-
// append if file exists, if not create new
|
151 |
-
return file_exists($this->getLogFilename()) ? $this->_append() : $this->_create();
|
152 |
-
}
|
153 |
-
|
154 |
-
/**
|
155 |
-
* Clear log file method
|
156 |
-
*
|
157 |
-
* @return bool
|
158 |
-
*/
|
159 |
-
public function clear()
|
160 |
-
{
|
161 |
-
return $this->_clear();
|
162 |
}
|
163 |
}
|
6 |
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Model_Log extends Mage_Core_Model_Abstract
|
10 |
{
|
|
|
|
|
|
|
|
|
|
|
11 |
/**
|
12 |
+
* Initialize resource model
|
13 |
*/
|
14 |
protected function _construct()
|
15 |
{
|
16 |
+
$this->_init('iparcel/log');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
17 |
}
|
18 |
}
|
app/code/community/Iparcel/{Logistics → All}/Model/Observer.php
RENAMED
@@ -3,10 +3,10 @@
|
|
3 |
* Observer class
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
/**
|
12 |
* Handles triggering the submitParcel call for the shipment.
|
@@ -16,7 +16,7 @@ class Iparcel_Logistics_Model_Observer
|
|
16 |
public function shipment_save_after($observer)
|
17 |
{
|
18 |
// if autotrack is enabled then order can be tracked when shipped
|
19 |
-
if (Mage::getStoreConfigFlag('carriers/
|
20 |
// If we are splitting shipments, skip automatic submission.
|
21 |
if (Mage::registry('iparcel_skip_auto_submit')) {
|
22 |
return true;
|
@@ -34,12 +34,12 @@ class Iparcel_Logistics_Model_Observer
|
|
34 |
}
|
35 |
|
36 |
$order = $observer->getShipment()->getOrder();
|
37 |
-
if ($order->getShippingCarrier() && $order->getShippingCarrier()->getCarrierCode() == '
|
38 |
-
$api = Mage::helper('
|
39 |
$response = $api->submitParcel($shipment);
|
40 |
|
41 |
// Find the name of the Service Level as defined in the Admin
|
42 |
-
$serviceLevels = Mage::helper('
|
43 |
$responseServiceLevelId = $response->ServiceLevels[0][0]->ServiceLevelID;
|
44 |
$serviceLevelTitle = 'I-Parcel';
|
45 |
if (array_key_exists($responseServiceLevelId, $serviceLevels)) {
|
@@ -67,16 +67,20 @@ class Iparcel_Logistics_Model_Observer
|
|
67 |
/** @var Mage_Sales_Model_Order $order */
|
68 |
$order = $observer->getOrder();
|
69 |
|
|
|
|
|
|
|
|
|
70 |
if (!$order->getQuote()) {
|
71 |
return;
|
72 |
}
|
73 |
// if it's i-parcel shipping method
|
74 |
-
if ($order->getShippingCarrier() && $order->getShippingCarrier()->getCarrierCode() != '
|
75 |
return;
|
76 |
}
|
77 |
|
78 |
// if autoship is enabled and order can be shipped
|
79 |
-
if (Mage::getStoreConfigFlag('carriers/
|
80 |
if ($order->canShip()) {
|
81 |
$converter = Mage::getModel('sales/convert_order');
|
82 |
/* var $converter Mage_Sales_Model_Convert_Order */
|
@@ -118,7 +122,7 @@ class Iparcel_Logistics_Model_Observer
|
|
118 |
{
|
119 |
$order = $observer->getOrder();
|
120 |
|
121 |
-
Mage::helper('
|
122 |
}
|
123 |
|
124 |
/**
|
@@ -130,7 +134,7 @@ class Iparcel_Logistics_Model_Observer
|
|
130 |
public function core_block_abstract_to_html_before($observer)
|
131 |
{
|
132 |
$block = $observer->getEvent()->getData('block');
|
133 |
-
$helper = Mage::helper('
|
134 |
|
135 |
if ($block instanceof Mage_Adminhtml_Block_Sales_Order_Shipment_View) {
|
136 |
$order = $block->getShipment()->getOrder();
|
@@ -172,7 +176,7 @@ class Iparcel_Logistics_Model_Observer
|
|
172 |
try {
|
173 |
$cart = $observer->getEvent()->getPaypalCart();
|
174 |
$shippingAddress = $cart->getSalesEntity()->getShippingAddress();
|
175 |
-
$totalAbstract = Mage::getModel('
|
176 |
if (!is_object($shippingAddress)) {
|
177 |
return;
|
178 |
}
|
@@ -186,7 +190,7 @@ class Iparcel_Logistics_Model_Observer
|
|
186 |
} else {
|
187 |
$carrier = $cart->getSalesEntity()->getShippingCarrier();
|
188 |
|
189 |
-
if (is_object($carrier) && $carrier->getCarrierCode() == '
|
190 |
$iparcelTax = $cart->getSalesEntity()->getIparcelTaxAmount();
|
191 |
$iparcelDuty = $cart->getSalesEntity()->getIparcelDutyAmount();
|
192 |
}
|
3 |
* Observer class
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Model_Observer
|
10 |
{
|
11 |
/**
|
12 |
* Handles triggering the submitParcel call for the shipment.
|
16 |
public function shipment_save_after($observer)
|
17 |
{
|
18 |
// if autotrack is enabled then order can be tracked when shipped
|
19 |
+
if (Mage::getStoreConfigFlag('carriers/iparcel/autotrack')) {
|
20 |
// If we are splitting shipments, skip automatic submission.
|
21 |
if (Mage::registry('iparcel_skip_auto_submit')) {
|
22 |
return true;
|
34 |
}
|
35 |
|
36 |
$order = $observer->getShipment()->getOrder();
|
37 |
+
if ($order->getShippingCarrier() && $order->getShippingCarrier()->getCarrierCode() == 'iparcel') {
|
38 |
+
$api = Mage::helper('iparcel/api');
|
39 |
$response = $api->submitParcel($shipment);
|
40 |
|
41 |
// Find the name of the Service Level as defined in the Admin
|
42 |
+
$serviceLevels = Mage::helper('iparcel')->getServiceLevels();
|
43 |
$responseServiceLevelId = $response->ServiceLevels[0][0]->ServiceLevelID;
|
44 |
$serviceLevelTitle = 'I-Parcel';
|
45 |
if (array_key_exists($responseServiceLevelId, $serviceLevels)) {
|
67 |
/** @var Mage_Sales_Model_Order $order */
|
68 |
$order = $observer->getOrder();
|
69 |
|
70 |
+
if (Mage::registry('iparcel_skip_auto_create_shipment')) {
|
71 |
+
return true;
|
72 |
+
}
|
73 |
+
|
74 |
if (!$order->getQuote()) {
|
75 |
return;
|
76 |
}
|
77 |
// if it's i-parcel shipping method
|
78 |
+
if ($order->getShippingCarrier() && $order->getShippingCarrier()->getCarrierCode() != 'iparcel') {
|
79 |
return;
|
80 |
}
|
81 |
|
82 |
// if autoship is enabled and order can be shipped
|
83 |
+
if (Mage::getStoreConfigFlag('carriers/iparcel/autoship')) {
|
84 |
if ($order->canShip()) {
|
85 |
$converter = Mage::getModel('sales/convert_order');
|
86 |
/* var $converter Mage_Sales_Model_Convert_Order */
|
122 |
{
|
123 |
$order = $observer->getOrder();
|
124 |
|
125 |
+
Mage::helper('iparcel/api')->cancelShipmentsByOrder($order);
|
126 |
}
|
127 |
|
128 |
/**
|
134 |
public function core_block_abstract_to_html_before($observer)
|
135 |
{
|
136 |
$block = $observer->getEvent()->getData('block');
|
137 |
+
$helper = Mage::helper('iparcel');
|
138 |
|
139 |
if ($block instanceof Mage_Adminhtml_Block_Sales_Order_Shipment_View) {
|
140 |
$order = $block->getShipment()->getOrder();
|
176 |
try {
|
177 |
$cart = $observer->getEvent()->getPaypalCart();
|
178 |
$shippingAddress = $cart->getSalesEntity()->getShippingAddress();
|
179 |
+
$totalAbstract = Mage::getModel('iparcel/quote_address_total_abstract');
|
180 |
if (!is_object($shippingAddress)) {
|
181 |
return;
|
182 |
}
|
190 |
} else {
|
191 |
$carrier = $cart->getSalesEntity()->getShippingCarrier();
|
192 |
|
193 |
+
if (is_object($carrier) && $carrier->getCarrierCode() == 'iparcel') {
|
194 |
$iparcelTax = $cart->getSalesEntity()->getIparcelTaxAmount();
|
195 |
$iparcelDuty = $cart->getSalesEntity()->getIparcelDutyAmount();
|
196 |
}
|
app/code/community/Iparcel/{Logistics → All}/Model/Order/Creditmemo/Total/Duty.php
RENAMED
@@ -3,10 +3,10 @@
|
|
3 |
* i-parcel model for displaying duty total on credit memos
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo)
|
12 |
{
|
3 |
* i-parcel model for displaying duty total on credit memos
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Model_Order_Creditmemo_Total_Duty extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract
|
10 |
{
|
11 |
public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo)
|
12 |
{
|
app/code/community/Iparcel/{Logistics → All}/Model/Order/Creditmemo/Total/Tax.php
RENAMED
@@ -3,10 +3,10 @@
|
|
3 |
* i-parcel model for displaying tax total on credit memos
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
|
12 |
public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo)
|
3 |
* i-parcel model for displaying tax total on credit memos
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Model_Order_Creditmemo_Total_Tax extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract
|
10 |
{
|
11 |
|
12 |
public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo)
|
app/code/community/Iparcel/{Logistics → All}/Model/Order/Invoice/Total/Duty.php
RENAMED
@@ -3,10 +3,10 @@
|
|
3 |
* i-parcel model for displaying duty total on invoices
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
public function collect(Mage_Sales_Model_Order_Invoice $invoice)
|
12 |
{
|
3 |
* i-parcel model for displaying duty total on invoices
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Model_Order_Invoice_Total_Duty extends Mage_Sales_Model_Order_Invoice_Total_Abstract
|
10 |
{
|
11 |
public function collect(Mage_Sales_Model_Order_Invoice $invoice)
|
12 |
{
|
app/code/community/Iparcel/{Logistics → All}/Model/Order/Invoice/Total/Tax.php
RENAMED
@@ -3,10 +3,10 @@
|
|
3 |
* i-parcel model for displaying tax total on invoices
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
public function collect(Mage_Sales_Model_Order_Invoice $invoice)
|
12 |
{
|
3 |
* i-parcel model for displaying tax total on invoices
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Model_Order_Invoice_Total_Tax extends Mage_Sales_Model_Order_Invoice_Total_Abstract
|
10 |
{
|
11 |
public function collect(Mage_Sales_Model_Order_Invoice $invoice)
|
12 |
{
|
app/code/community/Iparcel/All/Model/Payment/Iparcel.php
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Class for i-parcel external sales API payment method
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Model_Payment_Iparcel extends Mage_Payment_Model_Method_Abstract
|
10 |
+
{
|
11 |
+
protected $_code = 'iparcel';
|
12 |
+
protected $_canUseCheckout = false;
|
13 |
+
protected $_canUseForMultishipping = false;
|
14 |
+
protected $_canUseInternal = false;
|
15 |
+
protected $_canCapture = true;
|
16 |
+
}
|
app/code/community/Iparcel/{Logistics → All}/Model/Quote/Address/Total/Abstract.php
RENAMED
@@ -3,10 +3,10 @@
|
|
3 |
* Abstract model for i-parcel Quote Address totals
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
/**
|
12 |
* Determines if the address is using an i-parcel shipping method
|
@@ -18,11 +18,9 @@ class Iparcel_Logistics_Model_Quote_Address_Total_Abstract extends Mage_Sales_Mo
|
|
18 |
{
|
19 |
$shippingMethod = $address->getShippingMethod();
|
20 |
$shippingMethod = explode('_', $shippingMethod);
|
21 |
-
|
22 |
-
if ($shippingMethod[0] == 'iplogistics') {
|
23 |
return true;
|
24 |
}
|
25 |
-
|
26 |
return false;
|
27 |
}
|
28 |
}
|
3 |
* Abstract model for i-parcel Quote Address totals
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Model_Quote_Address_Total_Abstract extends Mage_Sales_Model_Quote_Address_Total_Abstract
|
10 |
{
|
11 |
/**
|
12 |
* Determines if the address is using an i-parcel shipping method
|
18 |
{
|
19 |
$shippingMethod = $address->getShippingMethod();
|
20 |
$shippingMethod = explode('_', $shippingMethod);
|
21 |
+
if ($shippingMethod[0] == 'iparcel') {
|
|
|
22 |
return true;
|
23 |
}
|
|
|
24 |
return false;
|
25 |
}
|
26 |
}
|
app/code/community/Iparcel/All/Model/Quote/Address/Total/Collector.php
ADDED
@@ -0,0 +1,52 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Class to reorder Magento's total collectors
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Model_Quote_Address_Total_Collector extends Mage_Sales_Model_Quote_Address_Total_Collector
|
10 |
+
{
|
11 |
+
public function getCollectors()
|
12 |
+
{
|
13 |
+
if (Mage::getStoreConfig('iparcel/tax/mode') == Iparcel_All_Model_System_Config_Source_Tax_Mode::DISABLED) {
|
14 |
+
return parent::getCollectors();
|
15 |
+
}
|
16 |
+
|
17 |
+
$collectors = parent::getCollectors();
|
18 |
+
|
19 |
+
$totals = array(
|
20 |
+
'iparcel_tax',
|
21 |
+
'iparcel_duty',
|
22 |
+
'grand_total',
|
23 |
+
'reward',
|
24 |
+
'giftcardaccount',
|
25 |
+
'customerbalance'
|
26 |
+
);
|
27 |
+
|
28 |
+
foreach ($totals as $total) {
|
29 |
+
$collectors = $this->_moveIndexToEnd($total, $collectors);
|
30 |
+
}
|
31 |
+
|
32 |
+
return $collectors;
|
33 |
+
}
|
34 |
+
|
35 |
+
/**
|
36 |
+
* Move index of array to the end of the array
|
37 |
+
*
|
38 |
+
* @param mixed $index
|
39 |
+
* @param array $array
|
40 |
+
* @return array
|
41 |
+
*/
|
42 |
+
private function _moveIndexToEnd($index, $array)
|
43 |
+
{
|
44 |
+
if (isset($array[$index])) {
|
45 |
+
$temp = $array[$index];
|
46 |
+
unset($array[$index]);
|
47 |
+
$array[$index] = $temp;
|
48 |
+
}
|
49 |
+
|
50 |
+
return $array;
|
51 |
+
}
|
52 |
+
}
|
app/code/community/Iparcel/{Logistics → All}/Model/Quote/Address/Total/Duty.php
RENAMED
@@ -3,10 +3,10 @@
|
|
3 |
* i-parcel model for shipping duty
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
public function __construct()
|
12 |
{
|
@@ -17,7 +17,7 @@ class Iparcel_Logistics_Model_Quote_Address_Total_Duty extends Iparcel_Logistics
|
|
17 |
* Used each time collectTotals is invoked to find the duty rate
|
18 |
*
|
19 |
* @param Mage_Sales_Model_Quote_Address $address
|
20 |
-
* @return
|
21 |
*/
|
22 |
public function collect(Mage_Sales_Model_Quote_Address $address)
|
23 |
{
|
@@ -25,8 +25,8 @@ class Iparcel_Logistics_Model_Quote_Address_Total_Duty extends Iparcel_Logistics
|
|
25 |
return;
|
26 |
}
|
27 |
|
28 |
-
if (Mage::helper('
|
29 |
-
|| Mage::helper('
|
30 |
parent::collect($address);
|
31 |
|
32 |
$dutyAndTaxes = Mage::registry('iparcel_duty_and_taxes');
|
@@ -44,7 +44,7 @@ class Iparcel_Logistics_Model_Quote_Address_Total_Duty extends Iparcel_Logistics
|
|
44 |
* Display the duty rate
|
45 |
*
|
46 |
* @param Mage_Sales_Model_Quote_Address $address
|
47 |
-
* @return
|
48 |
*/
|
49 |
public function fetch(Mage_Sales_Model_Quote_Address $address)
|
50 |
{
|
@@ -56,18 +56,18 @@ class Iparcel_Logistics_Model_Quote_Address_Total_Duty extends Iparcel_Logistics
|
|
56 |
$duty = $address->getIparcelDutyAmount();
|
57 |
|
58 |
// If we should show the tax and duty cumulatively
|
59 |
-
if (Mage::helper('
|
60 |
&& ($duty != null || $address->getIparcelTaxAmount() != null)) {
|
61 |
$address->addTotal(array(
|
62 |
'code' => $this->getCode(),
|
63 |
-
'title' => Mage::helper('
|
64 |
'value' => $duty + $address->getIparcelTaxAmount()
|
65 |
));
|
66 |
-
} elseif (Mage::helper('
|
67 |
&& $duty != null) {
|
68 |
$address->addTotal(array(
|
69 |
'code' => $this->getCode(),
|
70 |
-
'title' => Mage::helper('
|
71 |
'value' => $duty
|
72 |
));
|
73 |
}
|
3 |
* i-parcel model for shipping duty
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Model_Quote_Address_Total_Duty extends Iparcel_All_Model_Quote_Address_Total_Abstract
|
10 |
{
|
11 |
public function __construct()
|
12 |
{
|
17 |
* Used each time collectTotals is invoked to find the duty rate
|
18 |
*
|
19 |
* @param Mage_Sales_Model_Quote_Address $address
|
20 |
+
* @return Iparcel_All_Model_Total_Duty
|
21 |
*/
|
22 |
public function collect(Mage_Sales_Model_Quote_Address $address)
|
23 |
{
|
25 |
return;
|
26 |
}
|
27 |
|
28 |
+
if (Mage::helper('iparcel')->getDisplayTaxAndDutyCumulatively()
|
29 |
+
|| Mage::helper('iparcel')->getDisplayTaxAndDutySeparately()) {
|
30 |
parent::collect($address);
|
31 |
|
32 |
$dutyAndTaxes = Mage::registry('iparcel_duty_and_taxes');
|
44 |
* Display the duty rate
|
45 |
*
|
46 |
* @param Mage_Sales_Model_Quote_Address $address
|
47 |
+
* @return Iparcel_All_Model_Total_Duty
|
48 |
*/
|
49 |
public function fetch(Mage_Sales_Model_Quote_Address $address)
|
50 |
{
|
56 |
$duty = $address->getIparcelDutyAmount();
|
57 |
|
58 |
// If we should show the tax and duty cumulatively
|
59 |
+
if (Mage::helper('iparcel')->getDisplayTaxAndDutyCumulatively()
|
60 |
&& ($duty != null || $address->getIparcelTaxAmount() != null)) {
|
61 |
$address->addTotal(array(
|
62 |
'code' => $this->getCode(),
|
63 |
+
'title' => Mage::helper('iparcel')->getTaxAndDutyLabel(),
|
64 |
'value' => $duty + $address->getIparcelTaxAmount()
|
65 |
));
|
66 |
+
} elseif (Mage::helper('iparcel')->getDisplayTaxAndDutySeparately()
|
67 |
&& $duty != null) {
|
68 |
$address->addTotal(array(
|
69 |
'code' => $this->getCode(),
|
70 |
+
'title' => Mage::helper('iparcel')->getDutyLabel(),
|
71 |
'value' => $duty
|
72 |
));
|
73 |
}
|
app/code/community/Iparcel/{Logistics → All}/Model/Quote/Address/Total/Tax.php
RENAMED
@@ -3,10 +3,10 @@
|
|
3 |
* i-parcel model for shipping tax
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
public function __construct()
|
12 |
{
|
@@ -17,7 +17,7 @@ class Iparcel_Logistics_Model_Quote_Address_Total_Tax extends Iparcel_Logistics_
|
|
17 |
* Used each time collectTotals is invoked to find the duty rate
|
18 |
*
|
19 |
* @param Mage_Sales_Model_Quote_Address $address
|
20 |
-
* @return
|
21 |
*/
|
22 |
public function collect(Mage_Sales_Model_Quote_Address $address)
|
23 |
{
|
@@ -26,13 +26,13 @@ class Iparcel_Logistics_Model_Quote_Address_Total_Tax extends Iparcel_Logistics_
|
|
26 |
}
|
27 |
|
28 |
if ($this->isIparcelShipping($address) &&
|
29 |
-
(Mage::helper('
|
30 |
-
|
31 |
parent::collect($address);
|
32 |
|
33 |
$tax = null;
|
34 |
|
35 |
-
$quote = Mage::getModel('
|
36 |
$quote->loadByQuoteId($address->getQuote()->getId());
|
37 |
|
38 |
/**
|
@@ -50,6 +50,7 @@ class Iparcel_Logistics_Model_Quote_Address_Total_Tax extends Iparcel_Logistics_
|
|
50 |
if ($dutyAndTaxes['service_levels'] == false) {
|
51 |
Mage::throwException('Failed to set shipping rates tax and duty.');
|
52 |
}
|
|
|
53 |
Mage::register('iparcel_duty_and_taxes', $dutyAndTaxes);
|
54 |
}
|
55 |
|
@@ -75,7 +76,7 @@ class Iparcel_Logistics_Model_Quote_Address_Total_Tax extends Iparcel_Logistics_
|
|
75 |
* Display the duty rate
|
76 |
*
|
77 |
* @param Mage_Sales_Model_Quote_Address $address
|
78 |
-
* @return
|
79 |
*/
|
80 |
public function fetch(Mage_Sales_Model_Quote_Address $address)
|
81 |
{
|
@@ -88,11 +89,11 @@ class Iparcel_Logistics_Model_Quote_Address_Total_Tax extends Iparcel_Logistics_
|
|
88 |
* Otherwise, the Duty model will handle displaying the combined total.
|
89 |
*/
|
90 |
if ($this->isIparcelShipping($address)
|
91 |
-
&& Mage::helper('
|
92 |
&& $address->getIparcelTaxAmount() != null) {
|
93 |
$address->addTotal(array(
|
94 |
'code' => $this->getCode(),
|
95 |
-
'title' => Mage::helper('
|
96 |
'value' => $address->getIparcelTaxAmount()
|
97 |
));
|
98 |
}
|
3 |
* i-parcel model for shipping tax
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Model_Quote_Address_Total_Tax extends Iparcel_All_Model_Quote_Address_Total_Abstract
|
10 |
{
|
11 |
public function __construct()
|
12 |
{
|
17 |
* Used each time collectTotals is invoked to find the duty rate
|
18 |
*
|
19 |
* @param Mage_Sales_Model_Quote_Address $address
|
20 |
+
* @return Iparcel_All_Model_Total_Tax
|
21 |
*/
|
22 |
public function collect(Mage_Sales_Model_Quote_Address $address)
|
23 |
{
|
26 |
}
|
27 |
|
28 |
if ($this->isIparcelShipping($address) &&
|
29 |
+
(Mage::helper('iparcel')->getDisplayTaxAndDutyCumulatively()
|
30 |
+
|| Mage::helper('iparcel')->getDisplayTaxAndDutySeparately())) {
|
31 |
parent::collect($address);
|
32 |
|
33 |
$tax = null;
|
34 |
|
35 |
+
$quote = Mage::getModel('iparcel/api_quote');
|
36 |
$quote->loadByQuoteId($address->getQuote()->getId());
|
37 |
|
38 |
/**
|
50 |
if ($dutyAndTaxes['service_levels'] == false) {
|
51 |
Mage::throwException('Failed to set shipping rates tax and duty.');
|
52 |
}
|
53 |
+
Mage::unregister('iparcel_duty_and_taxes');
|
54 |
Mage::register('iparcel_duty_and_taxes', $dutyAndTaxes);
|
55 |
}
|
56 |
|
76 |
* Display the duty rate
|
77 |
*
|
78 |
* @param Mage_Sales_Model_Quote_Address $address
|
79 |
+
* @return Iparcel_All_Model_Total_Tax
|
80 |
*/
|
81 |
public function fetch(Mage_Sales_Model_Quote_Address $address)
|
82 |
{
|
89 |
* Otherwise, the Duty model will handle displaying the combined total.
|
90 |
*/
|
91 |
if ($this->isIparcelShipping($address)
|
92 |
+
&& Mage::helper('iparcel')->getDisplayTaxAndDutySeparately()
|
93 |
&& $address->getIparcelTaxAmount() != null) {
|
94 |
$address->addTotal(array(
|
95 |
'code' => $this->getCode(),
|
96 |
+
'title' => Mage::helper('iparcel')->getTaxLabel(),
|
97 |
'value' => $address->getIparcelTaxAmount()
|
98 |
));
|
99 |
}
|
app/code/community/Iparcel/All/Model/Resource/Api/Quote.php
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Resource Model for Iparcel_All_Model_Api_Quote class
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Model_Resource_Api_Quote extends Mage_Core_Model_Resource_Db_Abstract
|
10 |
+
{
|
11 |
+
/**
|
12 |
+
* Initializing Resource
|
13 |
+
*/
|
14 |
+
protected function _construct()
|
15 |
+
{
|
16 |
+
$this->_init('iparcel/api_quote', 'id');
|
17 |
+
}
|
18 |
+
}
|
app/code/community/Iparcel/All/Model/Resource/Log.php
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Resource Model for Iparcel_All_Model_Log class
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Model_Resource_Log extends Mage_Core_Model_Resource_Db_Abstract
|
10 |
+
{
|
11 |
+
/**
|
12 |
+
* Initializing Resource
|
13 |
+
*/
|
14 |
+
protected function _construct()
|
15 |
+
{
|
16 |
+
$this->_init('iparcel/log', 'id');
|
17 |
+
}
|
18 |
+
}
|
app/code/community/Iparcel/All/Model/Resource/Log/Collection.php
ADDED
@@ -0,0 +1,29 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Collection model for log resource
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Model_Resource_Log_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
|
10 |
+
{
|
11 |
+
protected function _construct()
|
12 |
+
{
|
13 |
+
$this->_init('iparcel/log');
|
14 |
+
}
|
15 |
+
|
16 |
+
/**
|
17 |
+
* Deletes all items in the collection
|
18 |
+
*
|
19 |
+
* @return self
|
20 |
+
*/
|
21 |
+
public function deleteAllItems()
|
22 |
+
{
|
23 |
+
foreach ($this->getItems() as $item) {
|
24 |
+
$item->delete();
|
25 |
+
}
|
26 |
+
|
27 |
+
return $this;
|
28 |
+
}
|
29 |
+
}
|
app/code/community/Iparcel/All/Model/Resource/Mysql4/Setup.php
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Setup Resource class
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_Model_Resource_Mysql4_Setup extends Mage_Core_Model_Resource_Setup
|
10 |
+
{
|
11 |
+
}
|
app/code/community/Iparcel/{Logistics → All}/Model/Tax/Quote/Shipping.php
RENAMED
@@ -3,22 +3,21 @@
|
|
3 |
* Class to override Magento's tax rate
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
/**
|
12 |
* Returns i-parcel's quote address abstract class
|
13 |
*
|
14 |
-
* @return
|
15 |
*/
|
16 |
private function _getAbstract()
|
17 |
{
|
18 |
-
$model = new
|
19 |
return $model;
|
20 |
}
|
21 |
-
|
22 |
/**
|
23 |
* Prevent's Magento's tax calculation if i-parcel shipping method is used
|
24 |
*
|
@@ -28,23 +27,22 @@ class Iparcel_Logistics_Model_Tax_Quote_Shipping extends Mage_Tax_Model_Sales_To
|
|
28 |
public function fetch(Mage_Sales_Model_Quote_Address $address)
|
29 |
{
|
30 |
if ($this->_getAbstract()->isIparcelShipping($address) &&
|
31 |
-
Mage::getStoreConfig('iparcel/tax/mode') !=
|
32 |
return;
|
33 |
} else {
|
34 |
return parent::fetch($address);
|
35 |
}
|
36 |
}
|
37 |
-
|
38 |
/**
|
39 |
* Prevent's Magento's tax display if i-parcel shipping method is used
|
40 |
*
|
41 |
* @param Mage_Sales_Model_Quote_Address $address
|
42 |
-
* @return
|
43 |
*/
|
44 |
public function collect(Mage_Sales_Model_Quote_Address $address)
|
45 |
{
|
46 |
if ($this->_getAbstract()->isIparcelShipping($address) &&
|
47 |
-
Mage::getStoreConfig('iparcel/tax/mode') !=
|
48 |
return;
|
49 |
} else {
|
50 |
return parent::collect($address);
|
3 |
* Class to override Magento's tax rate
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Model_Tax_Quote_Shipping extends Mage_Tax_Model_Sales_Total_Quote_Shipping
|
10 |
{
|
11 |
/**
|
12 |
* Returns i-parcel's quote address abstract class
|
13 |
*
|
14 |
+
* @return Iparcel_All_Model_Quote_Address_Total_Abstract
|
15 |
*/
|
16 |
private function _getAbstract()
|
17 |
{
|
18 |
+
$model = new Iparcel_All_Model_Quote_Address_Total_Abstract;
|
19 |
return $model;
|
20 |
}
|
|
|
21 |
/**
|
22 |
* Prevent's Magento's tax calculation if i-parcel shipping method is used
|
23 |
*
|
27 |
public function fetch(Mage_Sales_Model_Quote_Address $address)
|
28 |
{
|
29 |
if ($this->_getAbstract()->isIparcelShipping($address) &&
|
30 |
+
Mage::getStoreConfig('iparcel/tax/mode') != Iparcel_All_Model_System_Config_Source_Tax_Mode::DISABLED) {
|
31 |
return;
|
32 |
} else {
|
33 |
return parent::fetch($address);
|
34 |
}
|
35 |
}
|
|
|
36 |
/**
|
37 |
* Prevent's Magento's tax display if i-parcel shipping method is used
|
38 |
*
|
39 |
* @param Mage_Sales_Model_Quote_Address $address
|
40 |
+
* @return object
|
41 |
*/
|
42 |
public function collect(Mage_Sales_Model_Quote_Address $address)
|
43 |
{
|
44 |
if ($this->_getAbstract()->isIparcelShipping($address) &&
|
45 |
+
Mage::getStoreConfig('iparcel/tax/mode') != Iparcel_All_Model_System_Config_Source_Tax_Mode::DISABLED) {
|
46 |
return;
|
47 |
} else {
|
48 |
return parent::collect($address);
|
app/code/community/Iparcel/{Logistics/Model/Tax/Quote/Tax.php → All/Model/Tax/Quote/Subtotal.php}
RENAMED
@@ -3,19 +3,19 @@
|
|
3 |
* Class to override Magento's tax rate
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
/**
|
12 |
* Returns i-parcel's quote address abstract class
|
13 |
*
|
14 |
-
* @return
|
15 |
*/
|
16 |
private function _getAbstract()
|
17 |
{
|
18 |
-
$model = new
|
19 |
return $model;
|
20 |
}
|
21 |
|
@@ -38,7 +38,7 @@ class Iparcel_Logistics_Model_Tax_Quote_Tax extends Mage_Tax_Model_Sales_Total_Q
|
|
38 |
* Prevent's Magento's tax display if i-parcel shipping method is used
|
39 |
*
|
40 |
* @param Mage_Sales_Model_Quote_Address $address
|
41 |
-
* @return
|
42 |
*/
|
43 |
public function collect(Mage_Sales_Model_Quote_Address $address)
|
44 |
{
|
3 |
* Class to override Magento's tax rate
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Model_Tax_Quote_Subtotal extends Mage_Tax_Model_Sales_Total_Quote_Subtotal
|
10 |
{
|
11 |
/**
|
12 |
* Returns i-parcel's quote address abstract class
|
13 |
*
|
14 |
+
* @return Iparcel_All_Model_Quote_Address_Total_Abstract
|
15 |
*/
|
16 |
private function _getAbstract()
|
17 |
{
|
18 |
+
$model = new Iparcel_All_Model_Quote_Address_Total_Abstract;
|
19 |
return $model;
|
20 |
}
|
21 |
|
38 |
* Prevent's Magento's tax display if i-parcel shipping method is used
|
39 |
*
|
40 |
* @param Mage_Sales_Model_Quote_Address $address
|
41 |
+
* @return object
|
42 |
*/
|
43 |
public function collect(Mage_Sales_Model_Quote_Address $address)
|
44 |
{
|
app/code/community/Iparcel/{Logistics/Model/Tax/Quote/Subtotal.php → All/Model/Tax/Quote/Tax.php}
RENAMED
@@ -3,19 +3,19 @@
|
|
3 |
* Class to override Magento's tax rate
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
/**
|
12 |
* Returns i-parcel's quote address abstract class
|
13 |
*
|
14 |
-
* @return
|
15 |
*/
|
16 |
private function _getAbstract()
|
17 |
{
|
18 |
-
$model = new
|
19 |
return $model;
|
20 |
}
|
21 |
|
@@ -27,7 +27,8 @@ class Iparcel_Logistics_Model_Tax_Quote_Subtotal extends Mage_Tax_Model_Sales_To
|
|
27 |
*/
|
28 |
public function fetch(Mage_Sales_Model_Quote_Address $address)
|
29 |
{
|
30 |
-
if ($this->_getAbstract()->isIparcelShipping($address)
|
|
|
31 |
return;
|
32 |
} else {
|
33 |
return parent::fetch($address);
|
@@ -38,11 +39,12 @@ class Iparcel_Logistics_Model_Tax_Quote_Subtotal extends Mage_Tax_Model_Sales_To
|
|
38 |
* Prevent's Magento's tax display if i-parcel shipping method is used
|
39 |
*
|
40 |
* @param Mage_Sales_Model_Quote_Address $address
|
41 |
-
* @return
|
42 |
*/
|
43 |
public function collect(Mage_Sales_Model_Quote_Address $address)
|
44 |
{
|
45 |
-
if ($this->_getAbstract()->isIparcelShipping($address)
|
|
|
46 |
return;
|
47 |
} else {
|
48 |
return parent::collect($address);
|
3 |
* Class to override Magento's tax rate
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Model_Tax_Quote_Tax extends Mage_Tax_Model_Sales_Total_Quote_Tax
|
10 |
{
|
11 |
/**
|
12 |
* Returns i-parcel's quote address abstract class
|
13 |
*
|
14 |
+
* @return Iparcel_All_Model_Quote_Address_Total_Abstract
|
15 |
*/
|
16 |
private function _getAbstract()
|
17 |
{
|
18 |
+
$model = new Iparcel_All_Model_Quote_Address_Total_Abstract;
|
19 |
return $model;
|
20 |
}
|
21 |
|
27 |
*/
|
28 |
public function fetch(Mage_Sales_Model_Quote_Address $address)
|
29 |
{
|
30 |
+
if ($this->_getAbstract()->isIparcelShipping($address)
|
31 |
+
&& Mage::getStoreConfig('iparcel/tax/mode') != Iparcel_All_Model_System_Config_Source_Tax_Mode::DISABLED) {
|
32 |
return;
|
33 |
} else {
|
34 |
return parent::fetch($address);
|
39 |
* Prevent's Magento's tax display if i-parcel shipping method is used
|
40 |
*
|
41 |
* @param Mage_Sales_Model_Quote_Address $address
|
42 |
+
* @return object
|
43 |
*/
|
44 |
public function collect(Mage_Sales_Model_Quote_Address $address)
|
45 |
{
|
46 |
+
if ($this->_getAbstract()->isIparcelShipping($address)
|
47 |
+
&& Mage::getStoreConfig('iparcel/tax/mode') != Iparcel_All_Model_System_Config_Source_Tax_Mode::DISABLED) {
|
48 |
return;
|
49 |
} else {
|
50 |
return parent::collect($address);
|
app/code/community/Iparcel/All/controllers/Adminhtml/Iparcel/LogController.php
CHANGED
@@ -36,9 +36,45 @@ class Iparcel_All_Adminhtml_Iparcel_LogController extends Mage_Adminhtml_Control
|
|
36 |
*/
|
37 |
public function clearAction()
|
38 |
{
|
39 |
-
|
40 |
-
|
41 |
-
|
42 |
$this->_redirect('*/*/index');
|
43 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
44 |
}
|
36 |
*/
|
37 |
public function clearAction()
|
38 |
{
|
39 |
+
$collection = Mage::getModel('iparcel/log')->getCollection();
|
40 |
+
$collection->deleteAllItems();
|
41 |
+
|
42 |
$this->_redirect('*/*/index');
|
43 |
}
|
44 |
+
|
45 |
+
/**
|
46 |
+
* Downloads CSV of i-parcel log table without file system write
|
47 |
+
*/
|
48 |
+
public function downloadAction()
|
49 |
+
{
|
50 |
+
$this->getResponse()->clearHeaders();
|
51 |
+
$this->getResponse()->setHeader('Content-Type', 'text/csv', true);
|
52 |
+
$this->getResponse()->setHeader('Content-Disposition', 'attachment;filename="iparcel-log.csv";', true);
|
53 |
+
$this->getResponse()->setHeader('Content-Transfer-Encoding', 'binary', true);
|
54 |
+
|
55 |
+
$fh = fopen('php://memory', 'rw');
|
56 |
+
|
57 |
+
$collection = Mage::getModel('iparcel/log')->getCollection();
|
58 |
+
$csv = "ID, Timestamp, \"API Controller\", Request, Response\n";
|
59 |
+
|
60 |
+
foreach ($collection as $item) {
|
61 |
+
$line = array(
|
62 |
+
$item->getId(),
|
63 |
+
$item->getCreatedAt(),
|
64 |
+
$item->getController(),
|
65 |
+
$item->getRequest(),
|
66 |
+
$item->getResponse()
|
67 |
+
);
|
68 |
+
|
69 |
+
fputcsv($fh, $line, ',');
|
70 |
+
rewind($fh);
|
71 |
+
$csv .= fgets($fh);
|
72 |
+
rewind($fh);
|
73 |
+
}
|
74 |
+
|
75 |
+
fclose($fh);
|
76 |
+
$this->getResponse()->setBody($csv);
|
77 |
+
|
78 |
+
return;
|
79 |
+
}
|
80 |
}
|
app/code/community/Iparcel/{Logistics/controllers/Adminhtml/Iplogistics → All/controllers/Adminhtml/Iparcel}/Shipment/SplitController.php
RENAMED
@@ -3,10 +3,10 @@
|
|
3 |
* Admin Shipment split controller
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
/**
|
12 |
* Save a split shipment
|
@@ -33,7 +33,7 @@ class Iparcel_Logistics_Adminhtml_Iplogistics_Shipment_SplitController extends M
|
|
33 |
}
|
34 |
|
35 |
try {
|
36 |
-
if (Mage::helper('
|
37 |
Mage::getSingleton('adminhtml/session')->addSuccess('Shipment successfully split');
|
38 |
}
|
39 |
} catch (Exception $e) {
|
3 |
* Admin Shipment split controller
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Adminhtml_Iparcel_Shipment_SplitController extends Mage_Adminhtml_Controller_Action
|
10 |
{
|
11 |
/**
|
12 |
* Save a split shipment
|
33 |
}
|
34 |
|
35 |
try {
|
36 |
+
if (Mage::helper('iparcel/api')->splitShipment($shipment, $itemsCollection)) {
|
37 |
Mage::getSingleton('adminhtml/session')->addSuccess('Shipment successfully split');
|
38 |
}
|
39 |
} catch (Exception $e) {
|
app/code/community/Iparcel/{Logistics/controllers/Adminhtml/Iplogistics → All/controllers/Adminhtml/Iparcel}/ShipmentController.php
RENAMED
@@ -3,10 +3,10 @@
|
|
3 |
* Admin Shipment management controller
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
-
* @package
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
/**
|
12 |
* Cancel's a shipment from i-parcel
|
@@ -18,7 +18,7 @@ class Iparcel_Logistics_Adminhtml_Iplogistics_ShipmentController extends Mage_Ad
|
|
18 |
$params = $this->getRequest()->getParams();
|
19 |
if (array_key_exists('shipment', $params)) {
|
20 |
$shipment = Mage::getModel('sales/order_shipment')->load($params['shipment']);
|
21 |
-
if (Mage::helper('
|
22 |
Mage::getSingleton('adminhtml/session')->addSuccess('Shipment canceled');
|
23 |
}
|
24 |
}
|
@@ -38,7 +38,7 @@ class Iparcel_Logistics_Adminhtml_Iplogistics_ShipmentController extends Mage_Ad
|
|
38 |
|
39 |
if (array_key_exists('shipment', $params)) {
|
40 |
|
41 |
-
if (Mage::helper('
|
42 |
Mage::register('current_shipment', Mage::getModel('sales/order_shipment')->load($params['shipment']));
|
43 |
$this->loadLayout()->renderLayout();
|
44 |
} else {
|
3 |
* Admin Shipment management controller
|
4 |
*
|
5 |
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
*/
|
9 |
+
class Iparcel_All_Adminhtml_Iparcel_ShipmentController extends Mage_Adminhtml_Controller_Action
|
10 |
{
|
11 |
/**
|
12 |
* Cancel's a shipment from i-parcel
|
18 |
$params = $this->getRequest()->getParams();
|
19 |
if (array_key_exists('shipment', $params)) {
|
20 |
$shipment = Mage::getModel('sales/order_shipment')->load($params['shipment']);
|
21 |
+
if (Mage::helper('iparcel/api')->cancelShipment($shipment)) {
|
22 |
Mage::getSingleton('adminhtml/session')->addSuccess('Shipment canceled');
|
23 |
}
|
24 |
}
|
38 |
|
39 |
if (array_key_exists('shipment', $params)) {
|
40 |
|
41 |
+
if (Mage::helper('iparcel')->getShipmentItemCount($params['shipment']) > 1) {
|
42 |
Mage::register('current_shipment', Mage::getModel('sales/order_shipment')->load($params['shipment']));
|
43 |
$this->loadLayout()->renderLayout();
|
44 |
} else {
|
app/code/community/Iparcel/All/controllers/AjaxController.php
ADDED
@@ -0,0 +1,96 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* i-parcel frontend ajax controller
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_AjaxController extends Mage_Core_Controller_Front_Action
|
10 |
+
{
|
11 |
+
/**
|
12 |
+
* Configurable products action for post script
|
13 |
+
*/
|
14 |
+
public function configurableAction()
|
15 |
+
{
|
16 |
+
$sku = $this->getRequest()->getParam('sku');
|
17 |
+
$super_attribute = $this->getRequest()->getParam('super_attribute');
|
18 |
+
$customOptions = $this->getRequest()->getParam('options');
|
19 |
+
// var $product Mage_Catalog_Model_Product
|
20 |
+
$product = Mage::getModel('catalog/product')->loadByAttribute('sku', $sku);
|
21 |
+
|
22 |
+
// Return an empty response if no product matches the given SKU
|
23 |
+
if ($product == false) {
|
24 |
+
return;
|
25 |
+
}
|
26 |
+
|
27 |
+
/**
|
28 |
+
* If we are dealing with a simple product, we just need to worry about
|
29 |
+
* custom options.
|
30 |
+
*/
|
31 |
+
if ($product->getTypeId() == "configurable") {
|
32 |
+
// var $child Mage_Catalog_Model_Product
|
33 |
+
$child = Mage::getModel('catalog/product_type_configurable')->getProductByAttributes($super_attribute, $product);
|
34 |
+
|
35 |
+
// var $typeInstance Mage_Catalog_Model_Product_Type_Abstract
|
36 |
+
$typeInstance = $product->getTypeInstance(true);
|
37 |
+
if (!$typeInstance instanceof Mage_Catalog_Model_Product_Type_Configurable) {
|
38 |
+
return;
|
39 |
+
}
|
40 |
+
|
41 |
+
$attributes = $product->getTypeInstance(true)->getConfigurableAttributes($product);
|
42 |
+
// var $attributes array
|
43 |
+
$options = array();
|
44 |
+
foreach ($attributes as $attribute) {
|
45 |
+
$id = $attribute->getAttributeId();
|
46 |
+
foreach ($attribute->getPrices() as $value) {
|
47 |
+
if ($value['value_index'] == $super_attribute[$id]) {
|
48 |
+
$options[$attribute->getProductAttribute()->getAttributeCode()] = $value['label'];
|
49 |
+
break;
|
50 |
+
}
|
51 |
+
}
|
52 |
+
}
|
53 |
+
|
54 |
+
$sku = $child->getSku();
|
55 |
+
|
56 |
+
} else {
|
57 |
+
/**
|
58 |
+
* Attempt to load the simple product with the custom options set
|
59 |
+
* to match the user's input. If a product is found with this
|
60 |
+
* configuration, use the SKU formed by adding the option IDs to the
|
61 |
+
* product's SKU.
|
62 |
+
*/
|
63 |
+
$child = Mage::getModel('catalog/product')->load($product->getId());
|
64 |
+
$optionIds = array();
|
65 |
+
$options = array();
|
66 |
+
foreach ($child->getOptions() as $option) {
|
67 |
+
$id = $option->getId();
|
68 |
+
if (array_key_exists($id, $customOptions)) {
|
69 |
+
if ($customOptions[$id] !== "") {
|
70 |
+
$options[$option->getTitle()] = $customOptions[$id];
|
71 |
+
$optionIds[] = $id;
|
72 |
+
}
|
73 |
+
}
|
74 |
+
}
|
75 |
+
|
76 |
+
// If valid options are filled, at their ID to the SKU
|
77 |
+
if (count($optionIds)) {
|
78 |
+
$sku = $child->getSKU() . '__' . join('_', $optionIds);
|
79 |
+
}
|
80 |
+
}
|
81 |
+
|
82 |
+
if ($child) {
|
83 |
+
$this->getResponse()
|
84 |
+
->clearHeaders()
|
85 |
+
->setHeader('Content-Type', 'application/json')
|
86 |
+
->setBody(
|
87 |
+
json_encode(array(
|
88 |
+
'sku' => $sku,
|
89 |
+
'attributes' => $options,
|
90 |
+
'stock' => Mage::getModel('cataloginventory/stock_item')->loadByProduct($child)->getQty()
|
91 |
+
)
|
92 |
+
)
|
93 |
+
);
|
94 |
+
}
|
95 |
+
}
|
96 |
+
}
|
app/code/community/Iparcel/All/controllers/InternationalController.php
ADDED
@@ -0,0 +1,50 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* i-parcel International Customer controller
|
4 |
+
*
|
5 |
+
* @category Iparcel
|
6 |
+
* @package Iparcel_All
|
7 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
+
*/
|
9 |
+
class Iparcel_All_InternationalController extends Mage_Core_Controller_Front_Action
|
10 |
+
{
|
11 |
+
/**
|
12 |
+
* Preparing headers for external ajax
|
13 |
+
*/
|
14 |
+
protected function _prepareHeaders()
|
15 |
+
{
|
16 |
+
$this->getResponse()
|
17 |
+
->clearHeaders()
|
18 |
+
->setHeader('Access-Control-Allow-Origin', '*');
|
19 |
+
}
|
20 |
+
|
21 |
+
/**
|
22 |
+
* Changing international flag to true and printing if there was flag change
|
23 |
+
*/
|
24 |
+
public function enableAction()
|
25 |
+
{
|
26 |
+
$this->_prepareHeaders();
|
27 |
+
$current = Mage::helper('iparcel/international')->getInternational();
|
28 |
+
if ($current) {
|
29 |
+
echo 'false';
|
30 |
+
} else {
|
31 |
+
Mage::helper('iparcel/international')->setInternational(true);
|
32 |
+
echo 'true';
|
33 |
+
}
|
34 |
+
}
|
35 |
+
|
36 |
+
/**
|
37 |
+
* Changing international flag to false and printing if there was flag change
|
38 |
+
*/
|
39 |
+
public function disableAction()
|
40 |
+
{
|
41 |
+
$this->_prepareHeaders();
|
42 |
+
$current = Mage::helper('iparcel/international')->getInternational();
|
43 |
+
if ($current) {
|
44 |
+
Mage::helper('iparcel/international')->setInternational(false);
|
45 |
+
echo 'true';
|
46 |
+
} else {
|
47 |
+
echo 'false';
|
48 |
+
}
|
49 |
+
}
|
50 |
+
}
|
app/code/community/Iparcel/All/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Iparcel_All>
|
5 |
-
<version>1.
|
6 |
</Iparcel_All>
|
7 |
</modules>
|
8 |
<frontend>
|
@@ -15,6 +15,22 @@
|
|
15 |
</args>
|
16 |
</iparcel>
|
17 |
</routers>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
18 |
</frontend>
|
19 |
<crontab>
|
20 |
<jobs>
|
@@ -30,13 +46,53 @@
|
|
30 |
<models>
|
31 |
<iparcel>
|
32 |
<class>Iparcel_All_Model</class>
|
|
|
33 |
</iparcel>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
34 |
</models>
|
35 |
<blocks>
|
36 |
<iparcel>
|
37 |
<class>Iparcel_All_Block</class>
|
38 |
</iparcel>
|
|
|
|
|
|
|
|
|
|
|
39 |
</blocks>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
40 |
<helpers>
|
41 |
<iparcel>
|
42 |
<class>Iparcel_All_Helper</class>
|
@@ -70,7 +126,102 @@
|
|
70 |
</iparcel_catalog_product_observer>
|
71 |
</observers>
|
72 |
</catalog_product_delete_before>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
73 |
</events>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
74 |
</global>
|
75 |
<adminhtml>
|
76 |
<layout>
|
@@ -115,6 +266,12 @@
|
|
115 |
</routers>
|
116 |
</admin>
|
117 |
<default>
|
|
|
|
|
|
|
|
|
|
|
|
|
118 |
<catalog_mapping>
|
119 |
<config>
|
120 |
<auto_upload>0</auto_upload>
|
@@ -127,5 +284,12 @@
|
|
127 |
<price>1</price>
|
128 |
</attributes>
|
129 |
</catalog_mapping>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
130 |
</default>
|
131 |
</config>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Iparcel_All>
|
5 |
+
<version>1.2.0</version>
|
6 |
</Iparcel_All>
|
7 |
</modules>
|
8 |
<frontend>
|
15 |
</args>
|
16 |
</iparcel>
|
17 |
</routers>
|
18 |
+
<layout>
|
19 |
+
<updates>
|
20 |
+
<iparcel>
|
21 |
+
<file>iparcel.xml</file>
|
22 |
+
</iparcel>
|
23 |
+
</updates>
|
24 |
+
</layout>
|
25 |
+
<translate>
|
26 |
+
<modules>
|
27 |
+
<iparcel>
|
28 |
+
<files>
|
29 |
+
<default>iparcel.csv</default>
|
30 |
+
</files>
|
31 |
+
</iparcel>
|
32 |
+
</modules>
|
33 |
+
</translate>
|
34 |
</frontend>
|
35 |
<crontab>
|
36 |
<jobs>
|
46 |
<models>
|
47 |
<iparcel>
|
48 |
<class>Iparcel_All_Model</class>
|
49 |
+
<resourceModel>iparcel_resource</resourceModel>
|
50 |
</iparcel>
|
51 |
+
<iparcel_resource>
|
52 |
+
<class>Iparcel_All_Model_Resource</class>
|
53 |
+
<entities>
|
54 |
+
<api_quote>
|
55 |
+
<table>iparcel_all_api_quote</table>
|
56 |
+
</api_quote>
|
57 |
+
<log>
|
58 |
+
<table>iparcel_all_log</table>
|
59 |
+
</log>
|
60 |
+
</entities>
|
61 |
+
</iparcel_resource>
|
62 |
+
<sales>
|
63 |
+
<rewrite>
|
64 |
+
<quote_address_total_collector>Iparcel_All_Model_Quote_Address_Total_Collector</quote_address_total_collector>
|
65 |
+
</rewrite>
|
66 |
+
</sales>
|
67 |
+
<tax>
|
68 |
+
<rewrite>
|
69 |
+
<sales_total_quote_shipping>Iparcel_All_Model_Tax_Quote_Shipping</sales_total_quote_shipping>
|
70 |
+
<sales_total_quote_subtotal>Iparcel_All_Model_Tax_Quote_Subtotal</sales_total_quote_subtotal>
|
71 |
+
<sales_total_quote_tax>Iparcel_All_Model_Tax_Quote_Tax</sales_total_quote_tax>
|
72 |
+
</rewrite>
|
73 |
+
</tax>
|
74 |
</models>
|
75 |
<blocks>
|
76 |
<iparcel>
|
77 |
<class>Iparcel_All_Block</class>
|
78 |
</iparcel>
|
79 |
+
<catalog>
|
80 |
+
<rewrite>
|
81 |
+
<product_list>Iparcel_All_Block_Catalog_Product_List</product_list>
|
82 |
+
</rewrite>
|
83 |
+
</catalog>
|
84 |
</blocks>
|
85 |
+
<resources>
|
86 |
+
<iparcel_setup>
|
87 |
+
<setup>
|
88 |
+
<module>Iparcel_All</module>
|
89 |
+
<class>Iparcel_All_Model_Resource_Mysql4_Setup</class>
|
90 |
+
</setup>
|
91 |
+
<connection>
|
92 |
+
<use>core_setup</use>
|
93 |
+
</connection>
|
94 |
+
</iparcel_setup>
|
95 |
+
</resources>
|
96 |
<helpers>
|
97 |
<iparcel>
|
98 |
<class>Iparcel_All_Helper</class>
|
126 |
</iparcel_catalog_product_observer>
|
127 |
</observers>
|
128 |
</catalog_product_delete_before>
|
129 |
+
<sales_order_shipment_save_after>
|
130 |
+
<observers>
|
131 |
+
<iparcel_shipment_save_after>
|
132 |
+
<type>singleton</type>
|
133 |
+
<class>Iparcel_All_Model_Observer</class>
|
134 |
+
<method>shipment_save_after</method>
|
135 |
+
</iparcel_shipment_save_after>
|
136 |
+
</observers>
|
137 |
+
</sales_order_shipment_save_after>
|
138 |
+
<sales_order_place_after>
|
139 |
+
<observers>
|
140 |
+
<iparcel_order_place_after>
|
141 |
+
<type>singleton</type>
|
142 |
+
<class>Iparcel_All_Model_Observer</class>
|
143 |
+
<method>order_place_after</method>
|
144 |
+
</iparcel_order_place_after>
|
145 |
+
</observers>
|
146 |
+
</sales_order_place_after>
|
147 |
+
<order_cancel_after>
|
148 |
+
<observers>
|
149 |
+
<iparcel_order_cancel_after>
|
150 |
+
<type>singleton</type>
|
151 |
+
<class>Iparcel_All_Model_Observer</class>
|
152 |
+
<method>order_cancel_after</method>
|
153 |
+
</iparcel_order_cancel_after>
|
154 |
+
</observers>
|
155 |
+
</order_cancel_after>
|
156 |
+
<core_block_abstract_to_html_before>
|
157 |
+
<observers>
|
158 |
+
<iparcel_core_block_abstract_to_html_before>
|
159 |
+
<type>singleton</type>
|
160 |
+
<class>Iparcel_All_Model_Observer</class>
|
161 |
+
<method>core_block_abstract_to_html_before</method>
|
162 |
+
</iparcel_core_block_abstract_to_html_before>
|
163 |
+
</observers>
|
164 |
+
</core_block_abstract_to_html_before>
|
165 |
+
<paypal_prepare_line_items>
|
166 |
+
<observers>
|
167 |
+
<iparcel_paypal_prepare_line_item>
|
168 |
+
<type>singleton</type>
|
169 |
+
<class>Iparcel_All_Model_Observer</class>
|
170 |
+
<method>paypal_prepare_line_items</method>
|
171 |
+
</iparcel_paypal_prepare_line_item>
|
172 |
+
</observers>
|
173 |
+
</paypal_prepare_line_items>
|
174 |
</events>
|
175 |
+
<sales>
|
176 |
+
<quote>
|
177 |
+
<totals>
|
178 |
+
<iparcel_tax>
|
179 |
+
<class>iparcel/quote_address_total_tax</class>
|
180 |
+
<before>grand_total</before>
|
181 |
+
<after>shipping</after>
|
182 |
+
</iparcel_tax>
|
183 |
+
<iparcel_duty>
|
184 |
+
<class>iparcel/quote_address_total_duty</class>
|
185 |
+
<before>grand_total</before>
|
186 |
+
<after>iparcel_tax</after>
|
187 |
+
</iparcel_duty>
|
188 |
+
</totals>
|
189 |
+
</quote>
|
190 |
+
<order_invoice>
|
191 |
+
<totals>
|
192 |
+
<iparcel_tax>
|
193 |
+
<class>iparcel/order_invoice_total_tax</class>
|
194 |
+
</iparcel_tax>
|
195 |
+
<iparcel_duty>
|
196 |
+
<class>iparcel/order_invoice_total_duty</class>
|
197 |
+
</iparcel_duty>
|
198 |
+
</totals>
|
199 |
+
</order_invoice>
|
200 |
+
<order_creditmemo>
|
201 |
+
<totals>
|
202 |
+
<iparcel_tax>
|
203 |
+
<class>iparcel/order_creditmemo_total_tax</class>
|
204 |
+
</iparcel_tax>
|
205 |
+
<iparcel_duty>
|
206 |
+
<class>iparcel/order_creditmemo_total_duty</class>
|
207 |
+
</iparcel_duty>
|
208 |
+
</totals>
|
209 |
+
</order_creditmemo>
|
210 |
+
</sales>
|
211 |
+
<fieldsets>
|
212 |
+
<sales_convert_quote_address>
|
213 |
+
<base_iparcel_duty_amount><to_order>*</to_order></base_iparcel_duty_amount>
|
214 |
+
<iparcel_duty_amount><to_order>*</to_order></iparcel_duty_amount>
|
215 |
+
<base_iparcel_tax_amount><to_order>*</to_order></base_iparcel_tax_amount>
|
216 |
+
<iparcel_tax_amount><to_order>*</to_order></iparcel_tax_amount>
|
217 |
+
</sales_convert_quote_address>
|
218 |
+
<sales_convert_order>
|
219 |
+
<base_iparcel_duty_amount><to_invoice>*</to_invoice><to_cm>*</to_cm></base_iparcel_duty_amount>
|
220 |
+
<iparcel_duty_amount><to_invoice>*</to_invoice><to_cm>*</to_cm></iparcel_duty_amount>
|
221 |
+
<base_iparcel_tax_amount><to_invoice>*</to_invoice><to_cm>*</to_cm></base_iparcel_tax_amount>
|
222 |
+
<iparcel_tax_amount><to_invoice>*</to_invoice><to_cm>*</to_cm></iparcel_tax_amount>
|
223 |
+
</sales_convert_order>
|
224 |
+
</fieldsets>
|
225 |
</global>
|
226 |
<adminhtml>
|
227 |
<layout>
|
266 |
</routers>
|
267 |
</admin>
|
268 |
<default>
|
269 |
+
<payment>
|
270 |
+
<iparcel>
|
271 |
+
<active>1</active>
|
272 |
+
<model>iparcel/payment_iparcel</model>
|
273 |
+
</iparcel>
|
274 |
+
</payment>
|
275 |
<catalog_mapping>
|
276 |
<config>
|
277 |
<auto_upload>0</auto_upload>
|
284 |
<price>1</price>
|
285 |
</attributes>
|
286 |
</catalog_mapping>
|
287 |
+
<carriers>
|
288 |
+
<iparcel>
|
289 |
+
<title>UPS i-Parcel</title>
|
290 |
+
<model>iparcel/carrier_iparcel</model>
|
291 |
+
<autotrack>1</autotrack>
|
292 |
+
</iparcel>
|
293 |
+
</carriers>
|
294 |
</default>
|
295 |
</config>
|
app/code/community/Iparcel/All/etc/system.xml
CHANGED
@@ -6,7 +6,142 @@
|
|
6 |
<sort_order>500</sort_order>
|
7 |
</i-parcel>
|
8 |
</tabs>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
9 |
<sections>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
10 |
<iparcel>
|
11 |
<label>Configuration</label>
|
12 |
<tab>i-parcel</tab>
|
@@ -54,6 +189,126 @@
|
|
54 |
</dashboard>
|
55 |
</fields>
|
56 |
</config>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
57 |
</groups>
|
58 |
</iparcel>
|
59 |
<catalog_mapping>
|
6 |
<sort_order>500</sort_order>
|
7 |
</i-parcel>
|
8 |
</tabs>
|
9 |
+
<payment>
|
10 |
+
<groups>
|
11 |
+
<iparcel translate="label" module="iparcel">
|
12 |
+
<label>i-parcel</label>
|
13 |
+
<sort_order>9999</sort_order>
|
14 |
+
<show_in_default>0</show_in_default>
|
15 |
+
<show_in_website>0</show_in_website>
|
16 |
+
<show_in_store>0</show_in_store>
|
17 |
+
</iparcel>
|
18 |
+
</groups>
|
19 |
+
</payment>
|
20 |
<sections>
|
21 |
+
<carriers>
|
22 |
+
<groups>
|
23 |
+
<iparcel translate="label">
|
24 |
+
<label>i-parcel</label>
|
25 |
+
<frontend_type>text</frontend_type>
|
26 |
+
<sort_order>99</sort_order>
|
27 |
+
<show_in_default>0</show_in_default>
|
28 |
+
<show_in_website>0</show_in_website>
|
29 |
+
<show_in_store>0</show_in_store>
|
30 |
+
<fields>
|
31 |
+
<active translate="label">
|
32 |
+
<label>Enabled</label>
|
33 |
+
<frontend_type>select</frontend_type>
|
34 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
35 |
+
<sort_order>1</sort_order>
|
36 |
+
<show_in_default>1</show_in_default>
|
37 |
+
<show_in_website>1</show_in_website>
|
38 |
+
<show_in_store>1</show_in_store>
|
39 |
+
</active>
|
40 |
+
<title>
|
41 |
+
<label>Title</label>
|
42 |
+
<frontend_type>text</frontend_type>
|
43 |
+
<sort_order>100</sort_order>
|
44 |
+
<show_in_default>1</show_in_default>
|
45 |
+
<show_in_website>1</show_in_website>
|
46 |
+
<show_in_store>1</show_in_store>
|
47 |
+
</title>
|
48 |
+
<name>
|
49 |
+
<label>Allowed Services</label>
|
50 |
+
<frontend_model>iparcel/adminhtml_system_config_form_field_method</frontend_model>
|
51 |
+
<backend_model>adminhtml/system_config_backend_serialized_array</backend_model>
|
52 |
+
<sort_order>102</sort_order>
|
53 |
+
<show_in_default>1</show_in_default>
|
54 |
+
<show_in_website>1</show_in_website>
|
55 |
+
<show_in_store>1</show_in_store>
|
56 |
+
</name>
|
57 |
+
<whitelabelpay>
|
58 |
+
<label>Name of Displayed Payment Method</label>
|
59 |
+
<frontend_type>text</frontend_type>
|
60 |
+
<sort_order>105</sort_order>
|
61 |
+
<show_in_default>1</show_in_default>
|
62 |
+
<show_in_website>1</show_in_website>
|
63 |
+
<show_in_store>1</show_in_store>
|
64 |
+
</whitelabelpay>
|
65 |
+
<choose_domestic>
|
66 |
+
<label>Use alternate country of origin for Domestic orders</label>
|
67 |
+
<frontend_type>select</frontend_type>
|
68 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
69 |
+
<tooltip>If "Yes", you can choose an origin country that differs from the country selected in "Shipping Settings".</tooltip>
|
70 |
+
<sort_order>120</sort_order>
|
71 |
+
<show_in_default>1</show_in_default>
|
72 |
+
<show_in_website>1</show_in_website>
|
73 |
+
<show_in_store>1</show_in_store>
|
74 |
+
</choose_domestic>
|
75 |
+
<origin_country_id>
|
76 |
+
<label>Country of Origin</label>
|
77 |
+
<frontend_type>select</frontend_type>
|
78 |
+
<source_model>adminhtml/system_config_source_country</source_model>
|
79 |
+
<tooltip>If the user's destination country differs from this origin country, the i-parcel Shipping Method will be available.</tooltip>
|
80 |
+
<sort_order>130</sort_order>
|
81 |
+
<show_in_default>1</show_in_default>
|
82 |
+
<show_in_website>1</show_in_website>
|
83 |
+
<show_in_store>1</show_in_store>
|
84 |
+
</origin_country_id>
|
85 |
+
<autoship>
|
86 |
+
<label>Auto Generate Shipment</label>
|
87 |
+
<frontend_type>select</frontend_type>
|
88 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
89 |
+
<sort_order>160</sort_order>
|
90 |
+
<show_in_default>1</show_in_default>
|
91 |
+
<show_in_website>1</show_in_website>
|
92 |
+
<show_in_store>1</show_in_store>
|
93 |
+
</autoship>
|
94 |
+
<autotrack>
|
95 |
+
<label>Auto Generate Tracking on Shipping</label>
|
96 |
+
<frontend_type>select</frontend_type>
|
97 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
98 |
+
<tooltip>Set to No if you submit parcel tracking via API and use fulfilment system to create shipment</tooltip>
|
99 |
+
<sort_order>165</sort_order>
|
100 |
+
<show_in_default>1</show_in_default>
|
101 |
+
<show_in_website>1</show_in_website>
|
102 |
+
<show_in_store>1</show_in_store>
|
103 |
+
</autotrack>
|
104 |
+
<prefix>
|
105 |
+
<label>Completed Orders Use Different Order Prefix (Blank for None)</label>
|
106 |
+
<frontend_type>text</frontend_type>
|
107 |
+
<sort_order>170</sort_order>
|
108 |
+
<show_in_default>1</show_in_default>
|
109 |
+
<show_in_website>1</show_in_website>
|
110 |
+
<show_in_store>1</show_in_store>
|
111 |
+
</prefix>
|
112 |
+
<order_reference>
|
113 |
+
<label>Send Order Number as Reference</label>
|
114 |
+
<frontend_type>select</frontend_type>
|
115 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
116 |
+
<sort_order>180</sort_order>
|
117 |
+
<show_in_default>1</show_in_default>
|
118 |
+
<show_in_website>1</show_in_website>
|
119 |
+
<show_in_store>1</show_in_store>
|
120 |
+
</order_reference>
|
121 |
+
<sallowspecific translate="label">
|
122 |
+
<label>Ship to Applicable Countries</label>
|
123 |
+
<frontend_type>select</frontend_type>
|
124 |
+
<sort_order>140</sort_order>
|
125 |
+
<frontend_class>shipping-applicable-country</frontend_class>
|
126 |
+
<source_model>adminhtml/system_config_source_shipping_allspecificcountries</source_model>
|
127 |
+
<show_in_default>1</show_in_default>
|
128 |
+
<show_in_website>1</show_in_website>
|
129 |
+
<show_in_store>0</show_in_store>
|
130 |
+
</sallowspecific>
|
131 |
+
<specificcountry translate="label">
|
132 |
+
<label>Ship to Specific Countries</label>
|
133 |
+
<frontend_type>multiselect</frontend_type>
|
134 |
+
<sort_order>150</sort_order>
|
135 |
+
<source_model>adminhtml/system_config_source_country</source_model>
|
136 |
+
<show_in_default>1</show_in_default>
|
137 |
+
<show_in_website>1</show_in_website>
|
138 |
+
<show_in_store>0</show_in_store>
|
139 |
+
<can_be_empty>1</can_be_empty>
|
140 |
+
</specificcountry>
|
141 |
+
</fields>
|
142 |
+
</iparcel>
|
143 |
+
</groups>
|
144 |
+
</carriers>
|
145 |
<iparcel>
|
146 |
<label>Configuration</label>
|
147 |
<tab>i-parcel</tab>
|
189 |
</dashboard>
|
190 |
</fields>
|
191 |
</config>
|
192 |
+
<scripts translate="label">
|
193 |
+
<label>Scripts</label>
|
194 |
+
<frontend_type>text</frontend_type>
|
195 |
+
<sort_order>5</sort_order>
|
196 |
+
<show_in_default>0</show_in_default>
|
197 |
+
<show_in_website>0</show_in_website>
|
198 |
+
<show_in_store>0</show_in_store>
|
199 |
+
<fields>
|
200 |
+
<scripts translate="label">
|
201 |
+
<label>Enable Frontend Scripts</label>
|
202 |
+
<frontend_type>select</frontend_type>
|
203 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
204 |
+
<sort_order>5</sort_order>
|
205 |
+
<show_in_default>1</show_in_default>
|
206 |
+
<show_in_website>1</show_in_website>
|
207 |
+
<show_in_store>0</show_in_store>
|
208 |
+
</scripts>
|
209 |
+
<jquery translate="label">
|
210 |
+
<label>Enable jQuery</label>
|
211 |
+
<comment>Set it to "no" if you're using another jQuery library</comment>
|
212 |
+
<frontend_type>select</frontend_type>
|
213 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
214 |
+
<sort_order>10</sort_order>
|
215 |
+
<show_in_default>1</show_in_default>
|
216 |
+
<show_in_website>0</show_in_website>
|
217 |
+
<show_in_store>0</show_in_store>
|
218 |
+
</jquery>
|
219 |
+
<post translate="label">
|
220 |
+
<label>Custom POST scripts</label>
|
221 |
+
<frontend_type>file</frontend_type>
|
222 |
+
<backend_model>iparcel/config_script_js</backend_model>
|
223 |
+
<sort_order>15</sort_order>
|
224 |
+
<show_in_default>1</show_in_default>
|
225 |
+
<show_in_website>1</show_in_website>
|
226 |
+
<show_in_store>1</show_in_store>
|
227 |
+
</post>
|
228 |
+
</fields>
|
229 |
+
</scripts>
|
230 |
+
<international_customer translate="label">
|
231 |
+
<label>International Customer</label>
|
232 |
+
<frontend_type>text</frontend_type>
|
233 |
+
<sort_order>10</sort_order>
|
234 |
+
<show_in_default>0</show_in_default>
|
235 |
+
<show_in_website>0</show_in_website>
|
236 |
+
<show_in_store>0</show_in_store>
|
237 |
+
<fields>
|
238 |
+
<enable translate="label">
|
239 |
+
<label>Enabled</label>
|
240 |
+
<frontend_type>select</frontend_type>
|
241 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
242 |
+
<sort_order>0</sort_order>
|
243 |
+
<show_in_default>1</show_in_default>
|
244 |
+
<show_in_website>1</show_in_website>
|
245 |
+
<show_in_store>1</show_in_store>
|
246 |
+
</enable>
|
247 |
+
<visibility translate="label">
|
248 |
+
<label>Catalog product visibility attribute</label>
|
249 |
+
<frontend_type>select</frontend_type>
|
250 |
+
<source_model>iparcel/system_config_source_catalog_product_attribute_boolean</source_model>
|
251 |
+
<sort_order>1</sort_order>
|
252 |
+
<show_in_default>1</show_in_default>
|
253 |
+
<show_in_website>1</show_in_website>
|
254 |
+
<show_in_store>1</show_in_store>
|
255 |
+
<tooltip>If chosen attribute has value 'true' catalog product will be visible for international customer</tooltip>
|
256 |
+
</visibility>
|
257 |
+
</fields>
|
258 |
+
</international_customer>
|
259 |
+
<tax translate="label">
|
260 |
+
<label>Tax Intercepting</label>
|
261 |
+
<frontend_type>text</frontend_type>
|
262 |
+
<sort_order>15</sort_order>
|
263 |
+
<show_in_default>0</show_in_default>
|
264 |
+
<show_in_website>0</show_in_website>
|
265 |
+
<show_in_store>0</show_in_store>
|
266 |
+
<expanded>1</expanded>
|
267 |
+
<fields>
|
268 |
+
<mode translate="label">
|
269 |
+
<label>Mode</label>
|
270 |
+
<frontend_type>select</frontend_type>
|
271 |
+
<source_model>iparcel/system_config_source_tax_mode</source_model>
|
272 |
+
<sort_order>0</sort_order>
|
273 |
+
<show_in_default>1</show_in_default>
|
274 |
+
<show_in_website>1</show_in_website>
|
275 |
+
<show_in_store>1</show_in_store>
|
276 |
+
</mode>
|
277 |
+
<tax_duty_label translate="label">
|
278 |
+
<label><![CDATA[Tax&Duty Label]]></label>
|
279 |
+
<frontend_type>text</frontend_type>
|
280 |
+
<sort_order>5</sort_order>
|
281 |
+
<show_in_default>1</show_in_default>
|
282 |
+
<show_in_website>1</show_in_website>
|
283 |
+
<show_in_store>1</show_in_store>
|
284 |
+
<depends>
|
285 |
+
<mode>1</mode>
|
286 |
+
</depends>
|
287 |
+
</tax_duty_label>
|
288 |
+
<tax_label translate="label">
|
289 |
+
<label>Tax Label</label>
|
290 |
+
<frontend_type>text</frontend_type>
|
291 |
+
<sort_order>10</sort_order>
|
292 |
+
<show_in_default>1</show_in_default>
|
293 |
+
<show_in_website>1</show_in_website>
|
294 |
+
<show_in_store>1</show_in_store>
|
295 |
+
<depends>
|
296 |
+
<mode>2</mode>
|
297 |
+
</depends>
|
298 |
+
</tax_label>
|
299 |
+
<duty_label translate="label">
|
300 |
+
<label>Duty Label</label>
|
301 |
+
<frontend_type>text</frontend_type>
|
302 |
+
<sort_order>15</sort_order>
|
303 |
+
<show_in_default>1</show_in_default>
|
304 |
+
<show_in_website>1</show_in_website>
|
305 |
+
<show_in_store>1</show_in_store>
|
306 |
+
<depends>
|
307 |
+
<mode>2</mode>
|
308 |
+
</depends>
|
309 |
+
</duty_label>
|
310 |
+
</fields>
|
311 |
+
</tax>
|
312 |
</groups>
|
313 |
</iparcel>
|
314 |
<catalog_mapping>
|
app/code/community/Iparcel/{Logistics/sql/iplogistics_setup/mysql4-upgrade-1.0.5-1.0.6.php → All/sql/iparcel_setup/mysql4-upgrade-1.0.0-1.1.0.php}
RENAMED
@@ -1,11 +1,21 @@
|
|
1 |
<?php
|
2 |
-
/**
|
3 |
-
* Updates default Service Levels and names
|
4 |
-
*/
|
5 |
-
$installer = $this;
|
6 |
|
|
|
7 |
$installer->startSetup();
|
8 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
9 |
$data = array(
|
10 |
array(
|
11 |
'service_id' => 112,
|
@@ -44,7 +54,7 @@ $data = array(
|
|
44 |
Mage::getModel('core/config_data')
|
45 |
->setScope('default')
|
46 |
->setScopeId(0)
|
47 |
-
->setPath('carriers/
|
48 |
->setValue(serialize($data))
|
49 |
->save();
|
50 |
|
1 |
<?php
|
|
|
|
|
|
|
|
|
2 |
|
3 |
+
$installer = $this;
|
4 |
$installer->startSetup();
|
5 |
|
6 |
+
// Create a table to store tax & duty calculations
|
7 |
+
$installer->run("
|
8 |
+
DROP TABLE IF EXISTS {$this->getTable('iparcel/api_quote')};
|
9 |
+
CREATE TABLE {$this->getTable('iparcel/api_quote')} (
|
10 |
+
`id` int(11) unsigned NOT NULL auto_increment,
|
11 |
+
`quote_id` varchar(255) NOT NULL,
|
12 |
+
`parcel_id` varchar(255) NOT NULL,
|
13 |
+
`service_levels` TEXT NOT NULL,
|
14 |
+
PRIMARY KEY (`id`)
|
15 |
+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
16 |
+
");
|
17 |
+
|
18 |
+
// Add service levels
|
19 |
$data = array(
|
20 |
array(
|
21 |
'service_id' => 112,
|
54 |
Mage::getModel('core/config_data')
|
55 |
->setScope('default')
|
56 |
->setScopeId(0)
|
57 |
+
->setPath('carriers/iparcel/name')
|
58 |
->setValue(serialize($data))
|
59 |
->save();
|
60 |
|
app/code/community/Iparcel/{Logistics/sql/iplogistics_setup/mysql4-upgrade-1.0.0-1.0.1.php → All/sql/iparcel_setup/mysql4-upgrade-1.1.0-1.1.1.php}
RENAMED
@@ -14,10 +14,12 @@ $options = array(
|
|
14 |
'visible' => true,
|
15 |
'required' => false
|
16 |
);
|
|
|
17 |
foreach ($entities as $entity) {
|
18 |
$installer->addAttribute($entity, 'base_iparcel_duty_amount', $options);
|
19 |
$installer->addAttribute($entity, 'iparcel_duty_amount', $options);
|
20 |
$installer->addAttribute($entity, 'base_iparcel_tax_amount', $options);
|
21 |
$installer->addAttribute($entity, 'iparcel_tax_amount', $options);
|
22 |
}
|
|
|
23 |
$installer->endSetup();
|
14 |
'visible' => true,
|
15 |
'required' => false
|
16 |
);
|
17 |
+
|
18 |
foreach ($entities as $entity) {
|
19 |
$installer->addAttribute($entity, 'base_iparcel_duty_amount', $options);
|
20 |
$installer->addAttribute($entity, 'iparcel_duty_amount', $options);
|
21 |
$installer->addAttribute($entity, 'base_iparcel_tax_amount', $options);
|
22 |
$installer->addAttribute($entity, 'iparcel_tax_amount', $options);
|
23 |
}
|
24 |
+
|
25 |
$installer->endSetup();
|
app/code/community/Iparcel/All/sql/iparcel_setup/mysql4-upgrade-1.1.1-1.2.0.php
ADDED
@@ -0,0 +1,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
$installer = $this;
|
4 |
+
$installer->startSetup();
|
5 |
+
|
6 |
+
// Setup log table
|
7 |
+
$installer->run("
|
8 |
+
DROP TABLE IF EXISTS {$this->getTable('iparcel/log')};
|
9 |
+
CREATE TABLE {$this->getTable('iparcel/log')} (
|
10 |
+
`id` int(11) unsigned NOT NULL auto_increment,
|
11 |
+
`created_at` TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
12 |
+
`controller` varchar(255) NOT NULL,
|
13 |
+
`request` TEXT NOT NULL,
|
14 |
+
`response` TEXT NOT NULL,
|
15 |
+
PRIMARY KEY (`id`)
|
16 |
+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
17 |
+
");
|
18 |
+
|
19 |
+
$installer->endSetup();
|
app/code/community/Iparcel/Logistics/Helper/Api.php
CHANGED
@@ -11,471 +11,4 @@
|
|
11 |
*/
|
12 |
class Iparcel_Logistics_Helper_Api extends Iparcel_All_Helper_Api
|
13 |
{
|
14 |
-
/** @var string URL for the SubmitParcel endpoint */
|
15 |
-
protected $_submitParcel = 'https://webservices.i-parcel.com/api/SubmitParcel';
|
16 |
-
|
17 |
-
/** @var string URL for the Quote endpoint */
|
18 |
-
protected $_quote = 'https://webservices.i-parcel.com/api/Quote';
|
19 |
-
|
20 |
-
/** @var string URL for the Cancel endpoint */
|
21 |
-
protected $_cancel = 'https://webservices.i-parcel.com/api/Cancel';
|
22 |
-
|
23 |
-
/** @var string URL for the Split endpoint */
|
24 |
-
protected $_split = 'https://webservices.i-parcel.com/api/Split';
|
25 |
-
|
26 |
-
/**
|
27 |
-
* Send Quote request
|
28 |
-
*
|
29 |
-
* Takes the passed Rate Request and transforms it into data that can
|
30 |
-
* be passed to the API. It then submits the request as JSON to the
|
31 |
-
* Quote API endpoint.
|
32 |
-
*
|
33 |
-
* @param Mage_Shipping_Model_Rate_Request $request Magento Shipping Rate Request
|
34 |
-
* @return stdClass Response from the Quote API
|
35 |
-
*/
|
36 |
-
public function quote(Mage_Shipping_Model_Rate_Request $request)
|
37 |
-
{
|
38 |
-
// log init
|
39 |
-
$log = Mage::getModel('iparcel/log');
|
40 |
-
/* var $log Iparcel_All_Model_Api_Log */
|
41 |
-
$log->setController('Quote');
|
42 |
-
|
43 |
-
$quote = Mage::getModel('checkout/cart')->getQuote();
|
44 |
-
/* var $quote Mage_Sales_Model_Quote */
|
45 |
-
$shippingAddress = $quote->getShippingAddress();
|
46 |
-
/* var $shippingAddress Mage_Sales_Model_Quote_Address */
|
47 |
-
$billingAddress = $quote->getBillingAddress();
|
48 |
-
/* var $billingAddress Mage_Sales_Model_Quote_Address */
|
49 |
-
|
50 |
-
$json = array();
|
51 |
-
$addressInfo = array();
|
52 |
-
|
53 |
-
$billingStreet = $billingAddress->getStreet();
|
54 |
-
|
55 |
-
$billing = array();
|
56 |
-
$billing['City'] = $billingAddress->getCity();
|
57 |
-
$billing['CountryCode'] = $billingAddress->getCountryId();
|
58 |
-
$billing['Email'] = $quote->getCustomerEmail();
|
59 |
-
$billing['FirstName'] = $billingAddress->getFirstname();
|
60 |
-
$billing['LastName'] = $billingAddress->getLastname();
|
61 |
-
$billing['Phone'] = $billingAddress->getTelephone();
|
62 |
-
$billing['PostCode'] = $billingAddress->getPostcode();
|
63 |
-
$billing['Region'] = $billingAddress->getRegion();
|
64 |
-
for ($i=0; $i<count($billingStreet); $i++) {
|
65 |
-
$billing['Street'.($i+1)] = $billingStreet[$i];
|
66 |
-
}
|
67 |
-
|
68 |
-
$addressInfo['Billing'] = $billing;
|
69 |
-
|
70 |
-
$shippingStreet = explode("\n", $request->getDestStreet());
|
71 |
-
|
72 |
-
$shipping = array();
|
73 |
-
|
74 |
-
$shipping['City'] = $request->getDestCity();
|
75 |
-
$shipping['CountryCode'] = $request->getDestCountryId();
|
76 |
-
$shipping['Email'] = $quote->getCustomerEmail();
|
77 |
-
$shipping['FirstName'] = $shippingAddress->getFirstname();
|
78 |
-
$shipping['LastName'] = $shippingAddress->getLastname();
|
79 |
-
$shipping['Phone'] = $shippingAddress->getTelephone();
|
80 |
-
$shipping['PostCode'] = $request->getDestPostcode();
|
81 |
-
$shipping['Region'] = $request->getDestRegionCode();
|
82 |
-
foreach($shippingStreet as $key => $value) {
|
83 |
-
$shipping['Street' . ($key + 1)] = $value;
|
84 |
-
}
|
85 |
-
|
86 |
-
$addressInfo['Shipping'] = $shipping;
|
87 |
-
|
88 |
-
$addressInfo['ControlNumber'] = $quote->getCpf();
|
89 |
-
|
90 |
-
$json['AddressInfo'] = $addressInfo;
|
91 |
-
|
92 |
-
$json['CurrencyCode'] = $request->getPackageCurrency()->getCurrencyCode();
|
93 |
-
$json['DDP'] = true;
|
94 |
-
|
95 |
-
$itemsList = array();
|
96 |
-
|
97 |
-
foreach ($request->getAllItems() as $item) {
|
98 |
-
/* var $item Mage_Sales_Model_Quote_Item */
|
99 |
-
|
100 |
-
$itemProduct = Mage::getModel('catalog/product')->load($item->getProductId());
|
101 |
-
/* var $itemProduct Mage_Catalog_Model_Product */
|
102 |
-
|
103 |
-
//get item price
|
104 |
-
$itemPrice = (float)$item->getFinalPrice() ?: (float)$item->getPrice();
|
105 |
-
// if not price and item has parent (is configurable)
|
106 |
-
if (!$itemPrice && ($parent=$item->getParentItem())) {
|
107 |
-
// get parent price
|
108 |
-
$itemPrice = (float)$parent->getFinalPrice() ?: (float)$parent->getPrice();
|
109 |
-
}
|
110 |
-
// if still not price
|
111 |
-
if (!$itemPrice) {
|
112 |
-
// get product price
|
113 |
-
$itemPrice = (float)$item->getProduct()->getPrice();
|
114 |
-
}
|
115 |
-
|
116 |
-
// if product isn't virtual and is configurable or downloadable
|
117 |
-
if ($item["is_virtual"] == false && !in_array($itemProduct->getTypeId(), array('configurable','downloadable'))) {
|
118 |
-
// add line item node
|
119 |
-
$lineItem = array();
|
120 |
-
|
121 |
-
$lineItem['SKU'] = $item->getSku();
|
122 |
-
$lineItem['CustWeightLbs'] = (float)$item->getWeight();
|
123 |
-
$lineItem['ValueUSD'] = $itemPrice;
|
124 |
-
$lineItem['CustLengthInches'] = (float)$item->getLength();
|
125 |
-
$lineItem['CustWidthInches'] = (float)$item->getWidth();
|
126 |
-
$lineItem['CustHeightInches'] = (float)$item->getHeight();
|
127 |
-
$lineItem['Quantity'] = $item->getTotalQty();
|
128 |
-
$lineItem['ValueShopperCurrency'] = $itemPrice;
|
129 |
-
$lineItem['ShopperCurrency'] = Mage::app()->getStore()->getCurrentCurrencyCode();
|
130 |
-
|
131 |
-
$itemsList[] = $lineItem;
|
132 |
-
}
|
133 |
-
}
|
134 |
-
|
135 |
-
$json['ItemDetailsList'] = $itemsList;
|
136 |
-
|
137 |
-
// Get discounts
|
138 |
-
$totals = $quote->getTotals();
|
139 |
-
$discount = 0;
|
140 |
-
if (isset($totals['discount']) && $totals['discount']->getValue()) {
|
141 |
-
$discount = -1 * $totals['discount']->getValue();
|
142 |
-
}
|
143 |
-
|
144 |
-
$json['OtherDiscount'] = $discount;
|
145 |
-
$json['OtherDiscountCurrency'] = $quote->getQuoteCurrencyCode();
|
146 |
-
$json['ParcelID'] = 0;
|
147 |
-
$json['SessionID'] = '';
|
148 |
-
$json['key'] = Mage::helper('iplogistics')->getGuid();
|
149 |
-
|
150 |
-
$log->setRequest(json_encode($json));
|
151 |
-
|
152 |
-
$response = $this->_restJSON($json, $this->_quote);
|
153 |
-
|
154 |
-
$log->setResponse($response);
|
155 |
-
$log->save();
|
156 |
-
|
157 |
-
return json_decode($response);
|
158 |
-
}
|
159 |
-
|
160 |
-
/**
|
161 |
-
* Send Submit Parcel request
|
162 |
-
*
|
163 |
-
* Takes the passed Shipment and transforms it into data that can be passed
|
164 |
-
* to the API. It then submits the request as JSON to the SubmitParcel API
|
165 |
-
* endpoint.
|
166 |
-
*
|
167 |
-
* @param Mage_Sales_Model_Order_Shipment $shipment Magento shipment to be acknowledged as parcel
|
168 |
-
* @return stdClass Response from the SubmitParcel API
|
169 |
-
*/
|
170 |
-
public function submitParcel(Mage_Sales_Model_Order_Shipment $shipment)
|
171 |
-
{
|
172 |
-
$order = $shipment->getOrder();
|
173 |
-
|
174 |
-
// init log
|
175 |
-
$log = Mage::getModel('iparcel/log');
|
176 |
-
/* var $log Iparcel_All_Model_Api_Log */
|
177 |
-
$log->setController('Submit Parcel');
|
178 |
-
|
179 |
-
$shippingAddress = $order->getShippingAddress();
|
180 |
-
/* var $shippingAddress Mage_Sales_Model_Quote_Address */
|
181 |
-
$billingAddress = $order->getBillingAddress();
|
182 |
-
/* var $billingAddress Mage_Sales_Model_Quote_Address */
|
183 |
-
|
184 |
-
$json = array();
|
185 |
-
|
186 |
-
$addressInfo = array();
|
187 |
-
|
188 |
-
$billingStreet = $billingAddress->getStreet();
|
189 |
-
|
190 |
-
$billing = array();
|
191 |
-
|
192 |
-
$billing['City'] = $billingAddress->getCity();
|
193 |
-
$billing['CountryCode'] = $billingAddress->getCountryId();
|
194 |
-
$billing['Email'] = $order->getCustomerEmail();
|
195 |
-
$billing['FirstName'] = $billingAddress->getFirstname();
|
196 |
-
$billing['LastName'] = $billingAddress->getLastname();
|
197 |
-
$billing['Phone'] = $billingAddress->getTelephone();
|
198 |
-
$billing['PostCode'] = $billingAddress->getPostcode();
|
199 |
-
$billing['Region'] = $billingAddress->getRegion();
|
200 |
-
$billing['Street1'] = $billingStreet[0];
|
201 |
-
if (array_key_exists(1, $billingStreet)) {
|
202 |
-
$billing['Street2'] = $billingStreet[1];
|
203 |
-
}
|
204 |
-
|
205 |
-
$addressInfo['Billing'] = $billing;
|
206 |
-
|
207 |
-
$shippingStreet = $shippingAddress->getStreet();
|
208 |
-
|
209 |
-
$shipping = array();
|
210 |
-
|
211 |
-
$shipping['City'] = $shippingAddress->getCity();
|
212 |
-
$shipping['CountryCode'] = $shippingAddress->getCountryId();
|
213 |
-
$shipping['Email'] = $order->getCustomerEmail();
|
214 |
-
$shipping['FirstName'] = $shippingAddress->getFirstname();
|
215 |
-
$shipping['LastName'] = $shippingAddress->getLastname();
|
216 |
-
$shipping['Phone'] = $shippingAddress->getTelephone();
|
217 |
-
$shipping['PostCode'] = $shippingAddress->getPostcode();
|
218 |
-
$shipping['Region'] = $shippingAddress->getRegion();
|
219 |
-
$shipping['Street1'] = $shippingStreet[0];
|
220 |
-
$shipping['Street2'] = $shippingStreet[1];
|
221 |
-
|
222 |
-
$addressInfo['Shipping'] = $shipping;
|
223 |
-
|
224 |
-
$addressInfo['ControlNumber'] = $order->getCpf();
|
225 |
-
|
226 |
-
$json['AddressInfo'] = $addressInfo;
|
227 |
-
|
228 |
-
$json['CurrencyCode'] = $order->getOrderCurrencyCode();
|
229 |
-
$json['DDP'] = true;
|
230 |
-
|
231 |
-
$shipmentItems = $shipment->getAllItems();
|
232 |
-
|
233 |
-
$itemsList = array();
|
234 |
-
foreach ($shipmentItems as $item) {
|
235 |
-
/** @var $item Mage_Sales_Model_Order_Shipment_Item */
|
236 |
-
|
237 |
-
// Check for a configurable product -- the simple should be loaded
|
238 |
-
/** @var $itemProduct Mage_Catalog_Model_Product */
|
239 |
-
$orderItem = $item->getOrderItem();
|
240 |
-
if ($orderItem->getProductType() == "configurable") {
|
241 |
-
$itemProduct = $orderItem->getChildrenItems();
|
242 |
-
$itemProduct = $itemProduct[0];
|
243 |
-
} else {
|
244 |
-
$itemProduct = Mage::getModel('catalog/product')->load($item->getOrderItem()->getProductId());
|
245 |
-
}
|
246 |
-
|
247 |
-
//get item price
|
248 |
-
$itemPrice = (float)$item->getFinalPrice() ?: (float)$item->getPrice();
|
249 |
-
// if not price and item has parent (is configurable)
|
250 |
-
if (!$itemPrice && ($parent=$item->getParentItem())) {
|
251 |
-
// get parent price
|
252 |
-
$itemPrice = (float)$parent->getFinalPrice() ?: (float)$parent->getPrice();
|
253 |
-
}
|
254 |
-
// if still not price
|
255 |
-
if (!$itemPrice) {
|
256 |
-
// get product price
|
257 |
-
$itemPrice = (float)$item->getProduct()->getPrice();
|
258 |
-
}
|
259 |
-
|
260 |
-
// if product isn't virtual and is configurable or downloadable
|
261 |
-
if ($item["is_virtual"] == false && !in_array($itemProduct->getTypeId(), array('configurable','downloadable'))) {
|
262 |
-
// add line item node
|
263 |
-
$lineItem = array();
|
264 |
-
|
265 |
-
$lineItem['SKU'] = $item->getSku();
|
266 |
-
$lineItem['CustWeightLbs'] = (float)$item->getWeight();
|
267 |
-
$lineItem['ValueUSD'] = $itemPrice;
|
268 |
-
$lineItem['CustLengthInches'] = (float)$item->getLength();
|
269 |
-
$lineItem['CustWidthInches'] = (float)$item->getWidth();
|
270 |
-
$lineItem['CustHeightInches'] = (float)$item->getHeight();
|
271 |
-
$lineItem['Quantity'] = (float)$item->getQty();
|
272 |
-
$lineItem['ValueShopperCurrency'] = $itemPrice;
|
273 |
-
$lineItem['ShopperCurrency'] = Mage::app()->getStore()->getCurrentCurrencyCode();
|
274 |
-
|
275 |
-
$itemsList[] = $lineItem;
|
276 |
-
}
|
277 |
-
}
|
278 |
-
|
279 |
-
$json['ItemDetailsList'] = $itemsList;
|
280 |
-
|
281 |
-
// if order_reference is set add it to request
|
282 |
-
if (Mage::getStoreConfig('carriers/iplogistics/order_reference')) {
|
283 |
-
$json['OrderReference'] = $order->getIncrementId();
|
284 |
-
}
|
285 |
-
|
286 |
-
// Get discounts
|
287 |
-
$orderDiscountAmount = $order->getData('discount_amount');
|
288 |
-
$discount = 0;
|
289 |
-
if ($orderDiscountAmount != 0) {
|
290 |
-
$discount = -1 * $orderDiscountAmount;
|
291 |
-
}
|
292 |
-
|
293 |
-
// Get ServiceLevelID
|
294 |
-
$method = $order->getShippingMethod();
|
295 |
-
/* var $method string */
|
296 |
-
$method = explode('_', $method);
|
297 |
-
/* var $method array */
|
298 |
-
array_shift($method);
|
299 |
-
$serviceLevelId = implode('_', $method);
|
300 |
-
/* var $serviceLevelId string */
|
301 |
-
|
302 |
-
$json['OtherDiscount'] = $discount;
|
303 |
-
$json['OtherDiscountCurrency'] = $order->getOrderCurrencyCode();
|
304 |
-
$json['ServiceLevel'] = $serviceLevelId;
|
305 |
-
$json['SessionID'] = '';
|
306 |
-
$json['key'] = Mage::helper('iparcel')->getGuid();
|
307 |
-
|
308 |
-
$log->setRequest(json_encode($json));
|
309 |
-
|
310 |
-
$response = $this->_restJSON($json, $this->_submitParcel);
|
311 |
-
|
312 |
-
$log->setResponse($response);
|
313 |
-
$log->save();
|
314 |
-
|
315 |
-
return json_decode($response);
|
316 |
-
}
|
317 |
-
|
318 |
-
/**
|
319 |
-
* Cancels shipments via the Web Service API
|
320 |
-
*
|
321 |
-
* @param Mage_Sales_Model_Order_Shipment $shipment
|
322 |
-
* @return bool
|
323 |
-
*/
|
324 |
-
public function cancelShipment(Mage_Sales_Model_Order_Shipment $shipment)
|
325 |
-
{
|
326 |
-
$json = array();
|
327 |
-
$json['TrackingNumber'] = Mage::helper('iplogistics')->getTrackingNumber($shipment);
|
328 |
-
$json['UserNotes'] = '';
|
329 |
-
$json['Key'] = Mage::helper('iparcel')->getGuid();
|
330 |
-
|
331 |
-
$response = $this->_restJSON($json, $this->_cancel);
|
332 |
-
|
333 |
-
$log = Mage::getModel('iparcel/log');
|
334 |
-
$log->setRequest(json_encode($json));
|
335 |
-
$log->setResponse($response);
|
336 |
-
$log->setController('Cancel Shipment');
|
337 |
-
$log->save();
|
338 |
-
|
339 |
-
$response = json_decode($response);
|
340 |
-
|
341 |
-
if ($response->Code != 1) {
|
342 |
-
Mage::throwException(
|
343 |
-
'Failed when canceling shipment: ' . $response->Message
|
344 |
-
);
|
345 |
-
} else {
|
346 |
-
Mage::getModel('sales/order_shipment_api')->addComment(
|
347 |
-
$shipment->getIncrementId(),
|
348 |
-
'Shipment canceled',
|
349 |
-
false,
|
350 |
-
false
|
351 |
-
);
|
352 |
-
}
|
353 |
-
|
354 |
-
return true;
|
355 |
-
}
|
356 |
-
|
357 |
-
/**
|
358 |
-
* Cancels all shipments of an order
|
359 |
-
*
|
360 |
-
* @param Mage_Sales_Model_Order $order
|
361 |
-
* @return bool
|
362 |
-
*/
|
363 |
-
public function cancelShipmentsByOrder(Mage_Sales_Model_Order $order)
|
364 |
-
{
|
365 |
-
if (!Mage::helper('iplogistics')->isIparcelOrder($order)) {
|
366 |
-
return true;
|
367 |
-
}
|
368 |
-
|
369 |
-
$shipmentsCollection = $order->getShipmentsCollection();
|
370 |
-
|
371 |
-
foreach ($shipmentsCollection as $shipment) {
|
372 |
-
$this->cancelShipment($shipment);
|
373 |
-
}
|
374 |
-
|
375 |
-
return true;
|
376 |
-
}
|
377 |
-
|
378 |
-
/**
|
379 |
-
* Split a shipment via web service API
|
380 |
-
*
|
381 |
-
* @param Mage_Sales_Model_Order_Shipment $shipment
|
382 |
-
* @param array $itemCollection Items to split into separate shipment
|
383 |
-
* @return Object
|
384 |
-
*/
|
385 |
-
public function splitShipment(Mage_Sales_Model_Order_Shipment $shipment, $itemCollection)
|
386 |
-
{
|
387 |
-
if (count($itemCollection) < 1) {
|
388 |
-
Mage::throwException(
|
389 |
-
'Failed when splitting shipment: Item count must be greater than 0'
|
390 |
-
);
|
391 |
-
}
|
392 |
-
|
393 |
-
$json = array();
|
394 |
-
$json['TrackingNumber'] = Mage::helper('iplogistics')->getTrackingNumber($shipment);
|
395 |
-
$json['SkuList'] = array();
|
396 |
-
$json['Key'] = Mage::helper('iparcel')->getGuid();
|
397 |
-
|
398 |
-
$items = array();
|
399 |
-
foreach ($itemCollection as $item) {
|
400 |
-
$items['Sku'] = $item['sku'];
|
401 |
-
$items['Quantity'] = $item['qty'];
|
402 |
-
$json['SkuList'][] = $items;
|
403 |
-
}
|
404 |
-
|
405 |
-
$response = $this->_restJSON($json, $this->_split);
|
406 |
-
|
407 |
-
$log = Mage::getModel('iparcel/log');
|
408 |
-
$log->setController('Split Shipment');
|
409 |
-
$log->setRequest(json_encode($json));
|
410 |
-
$log->setResponse($response);
|
411 |
-
$log->save();
|
412 |
-
|
413 |
-
$response = json_decode($response);
|
414 |
-
|
415 |
-
if (is_array($response) && count($response) == 2) {
|
416 |
-
// Delete old shipment, create two new ones.
|
417 |
-
|
418 |
-
$order = $shipment->getOrder();
|
419 |
-
$orderItems = $order->getAllItems();
|
420 |
-
|
421 |
-
// Split the order items into two arrays, one for each new shipment
|
422 |
-
$firstItems = array();
|
423 |
-
$secondItems = array();
|
424 |
-
foreach($orderItems as $orderItem) {
|
425 |
-
foreach($itemCollection as $item) {
|
426 |
-
if ($orderItem->getSku() == $item['sku']) {
|
427 |
-
$firstItems[$orderItem->getId()] = $item['qty'];
|
428 |
-
$secondItems[$orderItem->getId()] = $orderItem->getQtyOrdered() - $item['qty'];
|
429 |
-
} else {
|
430 |
-
$secondItems[$orderItem->getId()] = $orderItem->getQtyOrdered();
|
431 |
-
}
|
432 |
-
}
|
433 |
-
}
|
434 |
-
|
435 |
-
// Delete the original shipment
|
436 |
-
$shipment->delete();
|
437 |
-
$items = $order->getAllVisibleItems();
|
438 |
-
foreach($items as $item){
|
439 |
-
$item->setQtyShipped(0);
|
440 |
-
$item->save();
|
441 |
-
}
|
442 |
-
|
443 |
-
Mage::register('iparcel_skip_auto_submit', true);
|
444 |
-
// Create a new shipment for each set of items
|
445 |
-
$firstShipment = Mage::getModel('sales/order_shipment_api')->create(
|
446 |
-
$order->getIncrementId(),
|
447 |
-
$firstItems,
|
448 |
-
null,
|
449 |
-
false,
|
450 |
-
false
|
451 |
-
);
|
452 |
-
Mage::getModel('sales/order_shipment_api')->addTrack(
|
453 |
-
$firstShipment,
|
454 |
-
$order->getShippingCarrier()->getCarrierCode(),
|
455 |
-
'I-Parcel',
|
456 |
-
$response[0]
|
457 |
-
);
|
458 |
-
|
459 |
-
$secondShipment = Mage::getModel('sales/order_shipment_api')->create(
|
460 |
-
$order->getIncrementId(),
|
461 |
-
$secondItems,
|
462 |
-
null,
|
463 |
-
false,
|
464 |
-
false
|
465 |
-
);
|
466 |
-
Mage::getModel('sales/order_shipment_api')->addTrack(
|
467 |
-
$secondShipment,
|
468 |
-
$order->getShippingCarrier()->getCarrierCode(),
|
469 |
-
'I-Parcel',
|
470 |
-
$response[1]
|
471 |
-
);
|
472 |
-
Mage::unregister('iparcel_skip_auto_submit');
|
473 |
-
} else {
|
474 |
-
Mage::throwException(
|
475 |
-
'Failed when splitting shipment.'
|
476 |
-
);
|
477 |
-
}
|
478 |
-
|
479 |
-
return true;
|
480 |
-
}
|
481 |
}
|
11 |
*/
|
12 |
class Iparcel_Logistics_Helper_Api extends Iparcel_All_Helper_Api
|
13 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
14 |
}
|
app/code/community/Iparcel/Logistics/Helper/Data.php
CHANGED
@@ -8,206 +8,4 @@
|
|
8 |
*/
|
9 |
class Iparcel_Logistics_Helper_Data extends Iparcel_All_Helper_Data
|
10 |
{
|
11 |
-
|
12 |
-
/**
|
13 |
-
* Determines if the current shipping rate request is International.
|
14 |
-
*
|
15 |
-
* "International" is determined by the store's Shipping Settings "Origin"
|
16 |
-
* country. This can be overridden in the i-parcel Shipping Method settings.
|
17 |
-
*
|
18 |
-
* @param Mage_Shipping_Model_Rate_Request $request
|
19 |
-
* @return boolean
|
20 |
-
*/
|
21 |
-
public function getIsInternational(Mage_Shipping_Model_Rate_Request $request)
|
22 |
-
{
|
23 |
-
$isInternational = false;
|
24 |
-
|
25 |
-
$originCountryId = $this->_getOriginCountry();
|
26 |
-
$destinationCountryId = $request->getDestCountryId();
|
27 |
-
|
28 |
-
if ($originCountryId !== $destinationCountryId) {
|
29 |
-
$isInternational = true;
|
30 |
-
}
|
31 |
-
|
32 |
-
return $isInternational;
|
33 |
-
}
|
34 |
-
|
35 |
-
/**
|
36 |
-
* Retrieve Service Levels from the database
|
37 |
-
*
|
38 |
-
* @return array Array of [ServiceLevel] => Title
|
39 |
-
*/
|
40 |
-
public function getServiceLevels()
|
41 |
-
{
|
42 |
-
$serviceLevels = unserialize(Mage::getStoreConfig('carriers/iplogistics/name'));
|
43 |
-
$formatted = array();
|
44 |
-
foreach ($serviceLevels as $level) {
|
45 |
-
$formatted[$level['service_id']] = $level['title'];
|
46 |
-
}
|
47 |
-
|
48 |
-
return $formatted;
|
49 |
-
}
|
50 |
-
|
51 |
-
/**
|
52 |
-
* Finds the Origin country as configured in the Magento admin.
|
53 |
-
*
|
54 |
-
* @return string Two-letter Country Code
|
55 |
-
*/
|
56 |
-
private function _getOriginCountry()
|
57 |
-
{
|
58 |
-
// If the admin has chose to select a different "origin" country
|
59 |
-
if (Mage::getStoreConfig('carriers/iplogistics/choose_domestic')) {
|
60 |
-
return Mage::getStoreConfig('carriers/iplogistics/origin_country_id');
|
61 |
-
}
|
62 |
-
|
63 |
-
return Mage::getStoreConfig('shipping/origin/country_id');
|
64 |
-
}
|
65 |
-
|
66 |
-
/**
|
67 |
-
* Determines if an order is an i-parcel order
|
68 |
-
*
|
69 |
-
* @param Mage_Sales_Model_Order $order
|
70 |
-
* @return bool
|
71 |
-
*/
|
72 |
-
public function isIparcelOrder(Mage_Sales_Model_Order $order)
|
73 |
-
{
|
74 |
-
$iparcelCarrier = Mage::getModel('iplogistics/carrier_iparcel');
|
75 |
-
if ($order->getShippingCarrier()->getCarrierCode() == $iparcelCarrier->getCarrierCode()) {
|
76 |
-
return true;
|
77 |
-
}
|
78 |
-
|
79 |
-
return false;
|
80 |
-
}
|
81 |
-
|
82 |
-
/**
|
83 |
-
* Finds the tracking number of a Magento shipment
|
84 |
-
*
|
85 |
-
* @param Mage_Sales_Model_Order_Shipment $shipment
|
86 |
-
* @return string
|
87 |
-
*/
|
88 |
-
public function getTrackingNumber(Mage_Sales_Model_Order_Shipment $shipment)
|
89 |
-
{
|
90 |
-
$trackingNumber = '';
|
91 |
-
$tracks = $shipment->getAllTracks();
|
92 |
-
|
93 |
-
if (array_key_exists(0, $tracks)) {
|
94 |
-
$trackingNumber = $tracks[0]->getTrackNumber();
|
95 |
-
}
|
96 |
-
|
97 |
-
return $trackingNumber;
|
98 |
-
}
|
99 |
-
|
100 |
-
/**
|
101 |
-
* Returns the admin URL to cancel a shipment
|
102 |
-
*
|
103 |
-
* @param string $shipment ID of shipment to cancel.
|
104 |
-
* @return string
|
105 |
-
*/
|
106 |
-
public function getShipmentCancelUrl($shipment)
|
107 |
-
{
|
108 |
-
return Mage::helper('adminhtml')->getUrl(
|
109 |
-
'adminhtml/iplogistics_shipment/cancel',
|
110 |
-
array('shipment' => $shipment)
|
111 |
-
);
|
112 |
-
}
|
113 |
-
|
114 |
-
/**
|
115 |
-
* Returns the admin URL to split a shipment
|
116 |
-
*
|
117 |
-
* @param string $shipment ID of shipment to split.
|
118 |
-
* @return string
|
119 |
-
*/
|
120 |
-
public function getShipmentSplitUrl($shipment)
|
121 |
-
{
|
122 |
-
return Mage::helper('adminhtml')->getUrl(
|
123 |
-
'adminhtml/iplogistics_shipment/split',
|
124 |
-
array('shipment' => $shipment)
|
125 |
-
);
|
126 |
-
}
|
127 |
-
|
128 |
-
/**
|
129 |
-
* Returns the total count of all items on a shipment
|
130 |
-
*
|
131 |
-
* @param $shipment Shipment ID or Mage_Sales_Model_Order_Shipment object to count
|
132 |
-
* @return string
|
133 |
-
*/
|
134 |
-
public function getShipmentItemCount($shipment)
|
135 |
-
{
|
136 |
-
if (!is_object($shipment)) {
|
137 |
-
$shipment = Mage::getModel('sales/order_shipment')->load($shipment);
|
138 |
-
}
|
139 |
-
|
140 |
-
$qty = 0;
|
141 |
-
$items = $shipment->getAllItems();
|
142 |
-
foreach ($items as $item) {
|
143 |
-
$qty += $item->getQty();
|
144 |
-
}
|
145 |
-
|
146 |
-
return $qty;
|
147 |
-
}
|
148 |
-
|
149 |
-
/**
|
150 |
-
* Helper method to find the value of the tax intercepting mode
|
151 |
-
*
|
152 |
-
* @return boolean
|
153 |
-
*/
|
154 |
-
public function getDisplayTaxAndDutyCumulatively()
|
155 |
-
{
|
156 |
-
return Mage::getStoreConfig('iparcel/tax/mode') == Iparcel_Logistics_Model_System_Config_Source_Tax_Mode::CUMULATIVELY;
|
157 |
-
}
|
158 |
-
|
159 |
-
/**
|
160 |
-
* Helper method to find the value of the tax intercepting mode
|
161 |
-
*
|
162 |
-
* @return boolean
|
163 |
-
*/
|
164 |
-
public function getDisplayTaxAndDutySeparately()
|
165 |
-
{
|
166 |
-
return Mage::getStoreConfig('iparcel/tax/mode') == Iparcel_Logistics_Model_System_Config_Source_Tax_Mode::SEPARATELY;
|
167 |
-
}
|
168 |
-
|
169 |
-
/**
|
170 |
-
* Return the Admin user created "Tax" Label
|
171 |
-
*
|
172 |
-
* @return string
|
173 |
-
*/
|
174 |
-
public function getTaxLabel()
|
175 |
-
{
|
176 |
-
$taxLabel = Mage::getStoreConfig('iparcel/tax/tax_label');
|
177 |
-
if ($taxLabel == '') {
|
178 |
-
return Mage::helper('iplogistics')->__('Tax');
|
179 |
-
} else {
|
180 |
-
return $taxLabel;
|
181 |
-
}
|
182 |
-
}
|
183 |
-
|
184 |
-
/**
|
185 |
-
* Return the Admin user created "Duty" Label
|
186 |
-
*
|
187 |
-
* @return string
|
188 |
-
*/
|
189 |
-
public function getDutyLabel()
|
190 |
-
{
|
191 |
-
$dutyLabel = Mage::getStoreConfig('iparcel/tax/duty_label');
|
192 |
-
if ($dutyLabel == '') {
|
193 |
-
return Mage::helper('iplogistics')->__('Duty');
|
194 |
-
} else {
|
195 |
-
return $dutyLabel;
|
196 |
-
}
|
197 |
-
}
|
198 |
-
|
199 |
-
/**
|
200 |
-
* Return the Admin user created "Tax And Duty" Label
|
201 |
-
*
|
202 |
-
* @return string
|
203 |
-
*/
|
204 |
-
public function getTaxAndDutyLabel()
|
205 |
-
{
|
206 |
-
$taxAndDutyLabel = Mage::getStoreConfig('iparcel/tax/tax_duty_label');
|
207 |
-
if ($taxAndDutyLabel == '') {
|
208 |
-
return Mage::helper('iplogistics')->__('Tax & Duty');
|
209 |
-
} else {
|
210 |
-
return $taxAndDutyLabel;
|
211 |
-
}
|
212 |
-
}
|
213 |
}
|
8 |
*/
|
9 |
class Iparcel_Logistics_Helper_Data extends Iparcel_All_Helper_Data
|
10 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
11 |
}
|
app/code/community/Iparcel/Logistics/Model/Carrier/Iparcel.php
DELETED
@@ -1,234 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
* i-parcel shipping method model
|
4 |
-
*
|
5 |
-
* @category Iparcel
|
6 |
-
* @package Iparcel_Logistics
|
7 |
-
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
-
*/
|
9 |
-
class Iparcel_Logistics_Model_Carrier_Iparcel extends Mage_Shipping_Model_Carrier_Abstract implements Mage_Shipping_Model_Carrier_Interface
|
10 |
-
{
|
11 |
-
protected $_code = 'iplogistics';
|
12 |
-
|
13 |
-
protected $_trackingUrl = 'https://tracking.i-parcel.com/secure/track.aspx?track=';
|
14 |
-
|
15 |
-
/**
|
16 |
-
* Check if carrier has shipping label option available
|
17 |
-
*
|
18 |
-
* @return bool
|
19 |
-
*/
|
20 |
-
public function isShippingLabelsAvailable()
|
21 |
-
{
|
22 |
-
return true;
|
23 |
-
}
|
24 |
-
|
25 |
-
/**
|
26 |
-
* Check if carrier has shipping tracking option available
|
27 |
-
*
|
28 |
-
* @return bool
|
29 |
-
*/
|
30 |
-
public function isTrackingAvailable()
|
31 |
-
{
|
32 |
-
return true;
|
33 |
-
}
|
34 |
-
|
35 |
-
/**
|
36 |
-
* Get info for track order page
|
37 |
-
*
|
38 |
-
* @param string $number Tracking Number
|
39 |
-
* @return Varien_Object
|
40 |
-
*/
|
41 |
-
public function getTrackingInfo($number)
|
42 |
-
{
|
43 |
-
return new Varien_Object(array(
|
44 |
-
'tracking' => $number,
|
45 |
-
'carrier_title' => $this->getConfigData('title'),
|
46 |
-
'url' => $this->_trackingUrl.$number
|
47 |
-
));
|
48 |
-
}
|
49 |
-
|
50 |
-
/**
|
51 |
-
* Return container types of carrier
|
52 |
-
*
|
53 |
-
* @return array
|
54 |
-
*/
|
55 |
-
public function getContainerTypes(Varien_Object $params = null)
|
56 |
-
{
|
57 |
-
return array('DEFAULT' => Mage::helper('iplogistics')->__('Default box'));
|
58 |
-
}
|
59 |
-
|
60 |
-
/**
|
61 |
-
* Do request to shipment
|
62 |
-
*
|
63 |
-
* @param Mage_Shipping_Model_Shipment_Request $request
|
64 |
-
* @return Varien_Object
|
65 |
-
*/
|
66 |
-
public function requestToShipment(Mage_Shipping_Model_Shipment_Request $request)
|
67 |
-
{
|
68 |
-
$shipping = $request->getOrderShipment();
|
69 |
-
/* var $shipping Mage_Sales_Model_Order_Shipment */
|
70 |
-
$tracking = $shipping->getAllTracks();
|
71 |
-
if (empty($tracking)) {
|
72 |
-
Mage::throwException('Invalid Request To Shipment Call');
|
73 |
-
}
|
74 |
-
$tracking = $tracking[0];
|
75 |
-
/* var $tracking Mage_Sales_Model_Order_Shipment_Track */
|
76 |
-
|
77 |
-
// prepare label PDF
|
78 |
-
$pdf = new Zend_Pdf();
|
79 |
-
$number = $tracking->getNumber();
|
80 |
-
$pdfPage = $pdf->pages[] = new Zend_Pdf_Page(('162:75'));
|
81 |
-
$barcodeFont = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir('media').'/font/code128.ttf');
|
82 |
-
$courier = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_COURIER);
|
83 |
-
$pdfPage->setFont($courier, 10);
|
84 |
-
$pdfPage->drawText($number, 15, 10);
|
85 |
-
$pdfPage->setFont($barcodeFont, 40);
|
86 |
-
$pdfPage->drawText($number, 15, 25);
|
87 |
-
|
88 |
-
$info = array();
|
89 |
-
$info[] = array(
|
90 |
-
'label_content' => $pdf->render(),
|
91 |
-
'tracking_number' => $number
|
92 |
-
);
|
93 |
-
|
94 |
-
// prepare response
|
95 |
-
$response = new Varien_Object();
|
96 |
-
$response->setTrackingNumer($number);
|
97 |
-
$response->setInfo($info);
|
98 |
-
|
99 |
-
return $response;
|
100 |
-
}
|
101 |
-
|
102 |
-
/**
|
103 |
-
* Collect shipping rates for i-parcel shipping
|
104 |
-
* refactor: add result check, add intermediate storage for parcel_id
|
105 |
-
*
|
106 |
-
* @param Mage_Shipping_Model_Rate_Request $request
|
107 |
-
* @return Mage_Shipping_Model_Rate_Result|bool
|
108 |
-
*/
|
109 |
-
public function collectRates(Mage_Shipping_Model_Rate_Request $request)
|
110 |
-
{
|
111 |
-
try {
|
112 |
-
/** @var boolean $internationalOrder */
|
113 |
-
$internationalOrder = Mage::helper('iplogistics')->getIsInternational($request);
|
114 |
-
|
115 |
-
if ($internationalOrder && Mage::getStoreConfig('carriers/iplogistics/active')) {
|
116 |
-
/** @var array $iparcel Tax & Duty totals */
|
117 |
-
$iparcelTaxAndDuty = array();
|
118 |
-
/** @var Mage_Shipping_Model_Rate_Result $result*/
|
119 |
-
$result = Mage::getModel('shipping/rate_result');
|
120 |
-
|
121 |
-
// Get Allowed Methods
|
122 |
-
/** @var array $allowed_methods Shipping method allowed via admin config "names" */
|
123 |
-
$allowed_methods = $this->getAllowedMethods();
|
124 |
-
|
125 |
-
/** @var stdClass $quote */
|
126 |
-
$quote = Mage::helper('iplogistics/api')->quote($request);
|
127 |
-
$iparcelTaxAndDuty['parcel_id'] = $quote->ParcelID;
|
128 |
-
|
129 |
-
$serviceLevel = new stdClass;
|
130 |
-
if (isset($quote->ServiceLevels)) {
|
131 |
-
$serviceLevel = $quote->ServiceLevels;
|
132 |
-
}
|
133 |
-
|
134 |
-
// Handling serviceLevels results and set up the shipping method
|
135 |
-
foreach ($serviceLevel as $ci) {
|
136 |
-
// setting up values
|
137 |
-
$servicename = @$ci->ServiceLevelID;
|
138 |
-
|
139 |
-
$duty = (float)@$ci->DutyCompanyCurrency;
|
140 |
-
$tax = (float)@$ci->TaxCompanyCurrency;
|
141 |
-
$shipping = (float)@$ci->ShippingChargeCompanyCurrency;
|
142 |
-
|
143 |
-
$tax_flag = Mage::getStoreConfig('iparcel/tax/mode') == Iparcel_Logistics_Model_System_Config_Source_Tax_Mode::DISABLED
|
144 |
-
|| $request->getDestCountryId() == $request->getCountryId();
|
145 |
-
// true if tax intercepting is disabled
|
146 |
-
|
147 |
-
$total = $tax_flag ? (float)($duty + $tax + $shipping) : (float)$shipping;
|
148 |
-
if (!isset($allowed_methods[$servicename])) {
|
149 |
-
continue;
|
150 |
-
}
|
151 |
-
|
152 |
-
$shiplabel = $allowed_methods[$servicename];
|
153 |
-
|
154 |
-
$title = $shiplabel;
|
155 |
-
if ($tax_flag) {
|
156 |
-
$title = Mage::helper('iplogistics')->__(
|
157 |
-
'%s (Shipping Price: %s Duty: %s Tax: %s)',
|
158 |
-
$shiplabel,
|
159 |
-
$this->_formatPrice($shipping),
|
160 |
-
$this->_formatPrice($duty),
|
161 |
-
$this->_formatPrice($tax)
|
162 |
-
);
|
163 |
-
}
|
164 |
-
|
165 |
-
$method = Mage::getModel('shipping/rate_result_method');
|
166 |
-
$method->setCarrier($this->_code);
|
167 |
-
$method->setCarrierTitle($this->getConfigData('title'));
|
168 |
-
$method->setMethod($servicename);
|
169 |
-
$method->setMethodTitle($title);
|
170 |
-
$method->setPrice($total);
|
171 |
-
$method->setCost($total);
|
172 |
-
|
173 |
-
// append method to result
|
174 |
-
$result->append($method);
|
175 |
-
|
176 |
-
$iparcelTaxAndDuty['service_levels'][$this->_code . '_' . $servicename] = array(
|
177 |
-
'duty' => $duty,
|
178 |
-
'tax' => $tax
|
179 |
-
);
|
180 |
-
}
|
181 |
-
|
182 |
-
// Store the shipping quote
|
183 |
-
$quoteId = Mage::getModel('checkout/cart')->getQuote()->getId();
|
184 |
-
|
185 |
-
$quote = Mage::getModel('iplogistics/api_quote');
|
186 |
-
$quote->loadByQuoteId($quoteId);
|
187 |
-
$quote->setQuoteId($quoteId);
|
188 |
-
$quote->setParcelId($iparcelTaxAndDuty['parcel_id']);
|
189 |
-
$quote->setServiceLevels($iparcelTaxAndDuty['service_levels']);
|
190 |
-
$quote->save();
|
191 |
-
|
192 |
-
return $result;
|
193 |
-
}
|
194 |
-
} catch (Exception $e) {
|
195 |
-
Mage::logException($e);
|
196 |
-
}
|
197 |
-
return false;
|
198 |
-
}
|
199 |
-
|
200 |
-
public function getMethodsNames()
|
201 |
-
{
|
202 |
-
$names = array();
|
203 |
-
$raw = $this->getConfigData('name');
|
204 |
-
|
205 |
-
$raw = unserialize($raw);
|
206 |
-
|
207 |
-
foreach ($raw as $method) {
|
208 |
-
$names[$method['service_id']] = $method['title'];
|
209 |
-
}
|
210 |
-
|
211 |
-
return $names;
|
212 |
-
}
|
213 |
-
|
214 |
-
/**
|
215 |
-
* @param float|int $price
|
216 |
-
* @return string
|
217 |
-
*/
|
218 |
-
protected function _formatPrice($price)
|
219 |
-
{
|
220 |
-
/** @var Mage_Core_Helper_Data $helper */
|
221 |
-
$helper = Mage::helper('core');
|
222 |
-
return $helper->formatPrice($price, false);
|
223 |
-
}
|
224 |
-
|
225 |
-
/**
|
226 |
-
* Get Allowed Shipping Methods
|
227 |
-
*
|
228 |
-
* @return array
|
229 |
-
*/
|
230 |
-
public function getAllowedMethods()
|
231 |
-
{
|
232 |
-
return $this->getMethodsNames();
|
233 |
-
}
|
234 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Iparcel/Logistics/Model/Quote/Address/Total/Collector.php
DELETED
@@ -1,29 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
* Class to reorder Magento's total collectors
|
4 |
-
*
|
5 |
-
* @category Iparcel
|
6 |
-
* @package Iparcel_Logistics
|
7 |
-
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
-
*/
|
9 |
-
class Iparcel_Logistics_Model_Quote_Address_Total_Collector extends Mage_Sales_Model_Quote_Address_Total_Collector
|
10 |
-
{
|
11 |
-
public function getCollectors()
|
12 |
-
{
|
13 |
-
$collectors = parent::getCollectors();
|
14 |
-
|
15 |
-
$iparcel_tax = $collectors['iparcel_tax'];
|
16 |
-
$iparcel_duty = $collectors['iparcel_duty'];
|
17 |
-
$grand_total = $collectors['grand_total'];
|
18 |
-
|
19 |
-
unset($collectors['iparcel_tax']);
|
20 |
-
unset($collectors['iparcel_duty']);
|
21 |
-
unset($collectors['grand_total']);
|
22 |
-
|
23 |
-
$collectors['iparcel_tax'] = $iparcel_tax;
|
24 |
-
$collectors['iparcel_duty'] = $iparcel_duty;
|
25 |
-
$collectors['grand_total'] = $grand_total;
|
26 |
-
|
27 |
-
return $collectors;
|
28 |
-
}
|
29 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Iparcel/Logistics/Model/Resource/Api/Quote.php
DELETED
@@ -1,18 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
* Resource Model for Iparcel_Logistics_Model_Api_Quote class
|
4 |
-
*
|
5 |
-
* @category Iparcel
|
6 |
-
* @package Iparcel_Logistics
|
7 |
-
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
-
*/
|
9 |
-
class Iparcel_Logistics_Model_Resource_Api_Quote extends Mage_Core_Model_Resource_Db_Abstract
|
10 |
-
{
|
11 |
-
/**
|
12 |
-
* Initializing Resource
|
13 |
-
*/
|
14 |
-
protected function _construct()
|
15 |
-
{
|
16 |
-
$this->_init('iplogistics/api_quote', 'id');
|
17 |
-
}
|
18 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Iparcel/Logistics/Model/System/Config/Source/Tax/Mode.php
DELETED
@@ -1,28 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
* Source model for iparcel/tax/mode config field
|
4 |
-
*
|
5 |
-
* @category Iparcel
|
6 |
-
* @package Iparcel_Logistics
|
7 |
-
* @author Bobby Burden <bburden@i-parcel.com>
|
8 |
-
*/
|
9 |
-
class Iparcel_Logistics_Model_System_Config_Source_Tax_Mode
|
10 |
-
{
|
11 |
-
const DISABLED = "0";
|
12 |
-
const CUMULATIVELY = "1";
|
13 |
-
const SEPARATELY = "2";
|
14 |
-
|
15 |
-
/**
|
16 |
-
* Options list
|
17 |
-
*
|
18 |
-
* @return array
|
19 |
-
*/
|
20 |
-
public function toOptionArray()
|
21 |
-
{
|
22 |
-
return array(
|
23 |
-
array('value' => self::DISABLED, 'label' => Mage::helper('iplogistics')->__('Disabled')),
|
24 |
-
array('value' => self::CUMULATIVELY, 'label' => Mage::helper('iplogistics')->__('Enabled - Tax and Duty cumulatively')),
|
25 |
-
array('value' => self::SEPARATELY, 'label' => Mage::helper('iplogistics')->__('Enabled - Tax and Duty separately'))
|
26 |
-
);
|
27 |
-
}
|
28 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Iparcel/Logistics/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Iparcel_Logistics>
|
5 |
-
<version>1.
|
6 |
</Iparcel_Logistics>
|
7 |
</modules>
|
8 |
<global>
|
@@ -11,26 +11,6 @@
|
|
11 |
<class>Iparcel_Logistics_Model</class>
|
12 |
<resourceModel>iplogistics_resource</resourceModel>
|
13 |
</iplogistics>
|
14 |
-
<iplogistics_resource>
|
15 |
-
<class>Iparcel_Logistics_Model_Resource</class>
|
16 |
-
<entities>
|
17 |
-
<api_quote>
|
18 |
-
<table>iparcel_logistics_api_quote</table>
|
19 |
-
</api_quote>
|
20 |
-
</entities>
|
21 |
-
</iplogistics_resource>
|
22 |
-
<sales>
|
23 |
-
<rewrite>
|
24 |
-
<quote_address_total_collector>Iparcel_Logistics_Model_Quote_Address_Total_Collector</quote_address_total_collector>
|
25 |
-
</rewrite>
|
26 |
-
</sales>
|
27 |
-
<tax>
|
28 |
-
<rewrite>
|
29 |
-
<sales_total_quote_shipping>Iparcel_Logistics_Model_Tax_Quote_Shipping</sales_total_quote_shipping>
|
30 |
-
<sales_total_quote_subtotal>Iparcel_Logistics_Model_Tax_Quote_Subtotal</sales_total_quote_subtotal>
|
31 |
-
<sales_total_quote_tax>Iparcel_Logistics_Model_Tax_Quote_Tax</sales_total_quote_tax>
|
32 |
-
</rewrite>
|
33 |
-
</tax>
|
34 |
</models>
|
35 |
<helpers>
|
36 |
<iplogistics>
|
@@ -53,131 +33,7 @@
|
|
53 |
</connection>
|
54 |
</iplogistics_setup>
|
55 |
</resources>
|
56 |
-
<events>
|
57 |
-
<sales_order_shipment_save_after>
|
58 |
-
<observers>
|
59 |
-
<iplogistics>
|
60 |
-
<type>singleton</type>
|
61 |
-
<class>iplogistics/observer</class>
|
62 |
-
<method>shipment_save_after</method>
|
63 |
-
</iplogistics>
|
64 |
-
</observers>
|
65 |
-
</sales_order_shipment_save_after>
|
66 |
-
<sales_order_place_after>
|
67 |
-
<observers>
|
68 |
-
<iplogistics>
|
69 |
-
<type>singleton</type>
|
70 |
-
<class>iplogistics/observer</class>
|
71 |
-
<method>order_place_after</method>
|
72 |
-
</iplogistics>
|
73 |
-
</observers>
|
74 |
-
</sales_order_place_after>
|
75 |
-
<order_cancel_after>
|
76 |
-
<observers>
|
77 |
-
<iplogistics>
|
78 |
-
<type>singleton</type>
|
79 |
-
<class>iplogistics/observer</class>
|
80 |
-
<method>order_cancel_after</method>
|
81 |
-
</iplogistics>
|
82 |
-
</observers>
|
83 |
-
</order_cancel_after>
|
84 |
-
<core_block_abstract_to_html_before>
|
85 |
-
<observers>
|
86 |
-
<iplogistics>
|
87 |
-
<type>singleton</type>
|
88 |
-
<class>iplogistics/observer</class>
|
89 |
-
<method>core_block_abstract_to_html_before</method>
|
90 |
-
</iplogistics>
|
91 |
-
</observers>
|
92 |
-
</core_block_abstract_to_html_before>
|
93 |
-
<paypal_prepare_line_items>
|
94 |
-
<observers>
|
95 |
-
<iplogistics>
|
96 |
-
<type>singleton</type>
|
97 |
-
<class>iplogistics/observer</class>
|
98 |
-
<method>paypal_prepare_line_items</method>
|
99 |
-
</iplogistics>
|
100 |
-
</observers>
|
101 |
-
</paypal_prepare_line_items>
|
102 |
-
</events>
|
103 |
-
<sales>
|
104 |
-
<quote>
|
105 |
-
<totals>
|
106 |
-
<iparcel_tax>
|
107 |
-
<class>iplogistics/quote_address_total_tax</class>
|
108 |
-
<before>grand_total</before>
|
109 |
-
<after>shipping</after>
|
110 |
-
</iparcel_tax>
|
111 |
-
<iparcel_duty>
|
112 |
-
<class>iplogistics/quote_address_total_duty</class>
|
113 |
-
<before>grand_total</before>
|
114 |
-
<after>iparcel_tax</after>
|
115 |
-
</iparcel_duty>
|
116 |
-
</totals>
|
117 |
-
</quote>
|
118 |
-
<order_invoice>
|
119 |
-
<totals>
|
120 |
-
<iparcel_tax>
|
121 |
-
<class>iplogistics/order_invoice_total_tax</class>
|
122 |
-
</iparcel_tax>
|
123 |
-
<iparcel_duty>
|
124 |
-
<class>iplogistics/order_invoice_total_duty</class>
|
125 |
-
</iparcel_duty>
|
126 |
-
</totals>
|
127 |
-
</order_invoice>
|
128 |
-
<order_creditmemo>
|
129 |
-
<totals>
|
130 |
-
<iparcel_tax>
|
131 |
-
<class>iplogistics/order_creditmemo_total_tax</class>
|
132 |
-
</iparcel_tax>
|
133 |
-
<iparcel_duty>
|
134 |
-
<class>iplogistics/order_creditmemo_total_duty</class>
|
135 |
-
</iparcel_duty>
|
136 |
-
</totals>
|
137 |
-
</order_creditmemo>
|
138 |
-
</sales>
|
139 |
-
<fieldsets>
|
140 |
-
<sales_convert_quote_address>
|
141 |
-
<base_iparcel_duty_amount><to_order>*</to_order></base_iparcel_duty_amount>
|
142 |
-
<iparcel_duty_amount><to_order>*</to_order></iparcel_duty_amount>
|
143 |
-
<base_iparcel_tax_amount><to_order>*</to_order></base_iparcel_tax_amount>
|
144 |
-
<iparcel_tax_amount><to_order>*</to_order></iparcel_tax_amount>
|
145 |
-
</sales_convert_quote_address>
|
146 |
-
<sales_convert_order>
|
147 |
-
<base_iparcel_duty_amount><to_invoice>*</to_invoice><to_cm>*</to_cm></base_iparcel_duty_amount>
|
148 |
-
<iparcel_duty_amount><to_invoice>*</to_invoice><to_cm>*</to_cm></iparcel_duty_amount>
|
149 |
-
<base_iparcel_tax_amount><to_invoice>*</to_invoice><to_cm>*</to_cm></base_iparcel_tax_amount>
|
150 |
-
<iparcel_tax_amount><to_invoice>*</to_invoice><to_cm>*</to_cm></iparcel_tax_amount>
|
151 |
-
</sales_convert_order>
|
152 |
-
</fieldsets>
|
153 |
</global>
|
154 |
-
<adminhtml>
|
155 |
-
<layout>
|
156 |
-
<updates>
|
157 |
-
<iplogistics>
|
158 |
-
<file>iplogistics.xml</file>
|
159 |
-
</iplogistics>
|
160 |
-
</updates>
|
161 |
-
</layout>
|
162 |
-
</adminhtml>
|
163 |
-
<frontend>
|
164 |
-
<translate>
|
165 |
-
<modules>
|
166 |
-
<iplogistics>
|
167 |
-
<files>
|
168 |
-
<default>iplogistics.csv</default>
|
169 |
-
</files>
|
170 |
-
</iplogistics>
|
171 |
-
</modules>
|
172 |
-
</translate>
|
173 |
-
<layout>
|
174 |
-
<updates>
|
175 |
-
<iplogistics>
|
176 |
-
<file>iplogistics.xml</file>
|
177 |
-
</iplogistics>
|
178 |
-
</updates>
|
179 |
-
</layout>
|
180 |
-
</frontend>
|
181 |
<admin>
|
182 |
<routers>
|
183 |
<adminhtml>
|
@@ -191,20 +47,17 @@
|
|
191 |
</admin>
|
192 |
<default>
|
193 |
<carriers>
|
194 |
-
<
|
195 |
<active>1</active>
|
196 |
-
<model>iplogistics/carrier_iparcel</model>
|
197 |
<title>I-Parcel</title>
|
198 |
<sort_order>10</sort_order>
|
199 |
<sallowspecific>0</sallowspecific>
|
200 |
-
<
|
201 |
-
<password>custtest</password>
|
202 |
-
<autoship>1</autoship>
|
203 |
<autotrack>1</autotrack>
|
204 |
<specificerrmsg>This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.</specificerrmsg>
|
205 |
<whitelabelpay>i-parcel</whitelabelpay>
|
206 |
<whitelabelship>i-parcel</whitelabelship>
|
207 |
-
</
|
208 |
</carriers>
|
209 |
</default>
|
210 |
</config>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Iparcel_Logistics>
|
5 |
+
<version>1.2.0</version>
|
6 |
</Iparcel_Logistics>
|
7 |
</modules>
|
8 |
<global>
|
11 |
<class>Iparcel_Logistics_Model</class>
|
12 |
<resourceModel>iplogistics_resource</resourceModel>
|
13 |
</iplogistics>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
14 |
</models>
|
15 |
<helpers>
|
16 |
<iplogistics>
|
33 |
</connection>
|
34 |
</iplogistics_setup>
|
35 |
</resources>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
36 |
</global>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
37 |
<admin>
|
38 |
<routers>
|
39 |
<adminhtml>
|
47 |
</admin>
|
48 |
<default>
|
49 |
<carriers>
|
50 |
+
<iparcel>
|
51 |
<active>1</active>
|
|
|
52 |
<title>I-Parcel</title>
|
53 |
<sort_order>10</sort_order>
|
54 |
<sallowspecific>0</sallowspecific>
|
55 |
+
<autoship>0</autoship>
|
|
|
|
|
56 |
<autotrack>1</autotrack>
|
57 |
<specificerrmsg>This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.</specificerrmsg>
|
58 |
<whitelabelpay>i-parcel</whitelabelpay>
|
59 |
<whitelabelship>i-parcel</whitelabelship>
|
60 |
+
</iparcel>
|
61 |
</carriers>
|
62 |
</default>
|
63 |
</config>
|
app/code/community/Iparcel/Logistics/etc/system.xml
CHANGED
@@ -1,190 +1,21 @@
|
|
1 |
<?xml version="1.0" encoding="UTF-8"?>
|
2 |
<config>
|
3 |
-
<tabs>
|
4 |
-
<iplogistics translate="label" module="iplogistics">
|
5 |
-
<label>i-parcel</label>
|
6 |
-
<sort_order>500</sort_order>
|
7 |
-
</iplogistics>
|
8 |
-
</tabs>
|
9 |
<sections>
|
10 |
<carriers>
|
11 |
<groups>
|
12 |
-
<
|
13 |
-
<label>i-parcel</label>
|
14 |
-
<frontend_type>text</frontend_type>
|
15 |
-
<sort_order>99</sort_order>
|
16 |
<show_in_default>1</show_in_default>
|
17 |
<show_in_website>1</show_in_website>
|
18 |
<show_in_store>1</show_in_store>
|
19 |
-
|
20 |
-
<active translate="label">
|
21 |
-
<label>Enabled</label>
|
22 |
-
<frontend_type>select</frontend_type>
|
23 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
24 |
-
<sort_order>1</sort_order>
|
25 |
-
<show_in_default>1</show_in_default>
|
26 |
-
<show_in_website>1</show_in_website>
|
27 |
-
<show_in_store>1</show_in_store>
|
28 |
-
</active>
|
29 |
-
<title>
|
30 |
-
<label>Title</label>
|
31 |
-
<frontend_type>text</frontend_type>
|
32 |
-
<sort_order>100</sort_order>
|
33 |
-
<show_in_default>1</show_in_default>
|
34 |
-
<show_in_website>1</show_in_website>
|
35 |
-
<show_in_store>1</show_in_store>
|
36 |
-
</title>
|
37 |
-
<name>
|
38 |
-
<label>Allowed Services</label>
|
39 |
-
<frontend_model>iplogistics/adminhtml_system_config_form_field_method</frontend_model>
|
40 |
-
<backend_model>adminhtml/system_config_backend_serialized_array</backend_model>
|
41 |
-
<sort_order>102</sort_order>
|
42 |
-
<show_in_default>1</show_in_default>
|
43 |
-
<show_in_website>1</show_in_website>
|
44 |
-
<show_in_store>1</show_in_store>
|
45 |
-
</name>
|
46 |
-
<whitelabelpay>
|
47 |
-
<label>Name of Displayed Payment Method</label>
|
48 |
-
<frontend_type>text</frontend_type>
|
49 |
-
<sort_order>105</sort_order>
|
50 |
-
<show_in_default>1</show_in_default>
|
51 |
-
<show_in_website>1</show_in_website>
|
52 |
-
<show_in_store>1</show_in_store>
|
53 |
-
</whitelabelpay>
|
54 |
-
<choose_domestic>
|
55 |
-
<label>Use alternate country of origin for Domestic orders</label>
|
56 |
-
<frontend_type>select</frontend_type>
|
57 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
58 |
-
<tooltip>If "Yes", you can choose an origin country that differs from the country selected in "Shipping Settings".</tooltip>
|
59 |
-
<sort_order>120</sort_order>
|
60 |
-
<show_in_default>1</show_in_default>
|
61 |
-
<show_in_website>1</show_in_website>
|
62 |
-
<show_in_store>1</show_in_store>
|
63 |
-
</choose_domestic>
|
64 |
-
<origin_country_id>
|
65 |
-
<label>Country of Origin</label>
|
66 |
-
<frontend_type>select</frontend_type>
|
67 |
-
<source_model>adminhtml/system_config_source_country</source_model>
|
68 |
-
<tooltip>If the user's destination country differs from this origin country, the i-parcel Shipping Method will be available.</tooltip>
|
69 |
-
<sort_order>130</sort_order>
|
70 |
-
<show_in_default>1</show_in_default>
|
71 |
-
<show_in_website>1</show_in_website>
|
72 |
-
<show_in_store>1</show_in_store>
|
73 |
-
</origin_country_id>
|
74 |
-
<autoship>
|
75 |
-
<label>Auto Generate Shipment</label>
|
76 |
-
<frontend_type>select</frontend_type>
|
77 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
78 |
-
<sort_order>160</sort_order>
|
79 |
-
<show_in_default>1</show_in_default>
|
80 |
-
<show_in_website>1</show_in_website>
|
81 |
-
<show_in_store>1</show_in_store>
|
82 |
-
</autoship>
|
83 |
-
<autotrack>
|
84 |
-
<label>Auto Generate Tracking on Shipping</label>
|
85 |
-
<frontend_type>select</frontend_type>
|
86 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
87 |
-
<tooltip>Set to No if you submit parcel tracking via API and use fulfilment system to create shipment</tooltip>
|
88 |
-
<sort_order>165</sort_order>
|
89 |
-
<show_in_default>1</show_in_default>
|
90 |
-
<show_in_website>1</show_in_website>
|
91 |
-
<show_in_store>1</show_in_store>
|
92 |
-
</autotrack>
|
93 |
-
<prefix>
|
94 |
-
<label>Completed Orders Use Different Order Prefix (Blank for None)</label>
|
95 |
-
<frontend_type>text</frontend_type>
|
96 |
-
<sort_order>170</sort_order>
|
97 |
-
<show_in_default>1</show_in_default>
|
98 |
-
<show_in_website>1</show_in_website>
|
99 |
-
<show_in_store>1</show_in_store>
|
100 |
-
</prefix>
|
101 |
-
<order_reference>
|
102 |
-
<label>Send Order Number as Reference</label>
|
103 |
-
<frontend_type>select</frontend_type>
|
104 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
105 |
-
<sort_order>180</sort_order>
|
106 |
-
<show_in_default>1</show_in_default>
|
107 |
-
<show_in_website>1</show_in_website>
|
108 |
-
<show_in_store>1</show_in_store>
|
109 |
-
</order_reference>
|
110 |
-
<sallowspecific translate="label">
|
111 |
-
<label>Ship to Applicable Countries</label>
|
112 |
-
<frontend_type>select</frontend_type>
|
113 |
-
<sort_order>140</sort_order>
|
114 |
-
<frontend_class>shipping-applicable-country</frontend_class>
|
115 |
-
<source_model>adminhtml/system_config_source_shipping_allspecificcountries</source_model>
|
116 |
-
<show_in_default>1</show_in_default>
|
117 |
-
<show_in_website>1</show_in_website>
|
118 |
-
<show_in_store>0</show_in_store>
|
119 |
-
</sallowspecific>
|
120 |
-
<specificcountry translate="label">
|
121 |
-
<label>Ship to Specific Countries</label>
|
122 |
-
<frontend_type>multiselect</frontend_type>
|
123 |
-
<sort_order>150</sort_order>
|
124 |
-
<source_model>adminhtml/system_config_source_country</source_model>
|
125 |
-
<show_in_default>1</show_in_default>
|
126 |
-
<show_in_website>1</show_in_website>
|
127 |
-
<show_in_store>0</show_in_store>
|
128 |
-
<can_be_empty>1</can_be_empty>
|
129 |
-
</specificcountry>
|
130 |
-
</fields>
|
131 |
-
</iplogistics>
|
132 |
</groups>
|
133 |
</carriers>
|
134 |
<iparcel>
|
135 |
<groups>
|
136 |
<tax translate="label">
|
137 |
-
<label>Tax Intercepting</label>
|
138 |
-
<frontend_type>text</frontend_type>
|
139 |
-
<sort_order>15</sort_order>
|
140 |
<show_in_default>1</show_in_default>
|
141 |
<show_in_website>1</show_in_website>
|
142 |
<show_in_store>1</show_in_store>
|
143 |
-
<expanded>1</expanded>
|
144 |
-
<fields>
|
145 |
-
<mode translate="label">
|
146 |
-
<label>Mode</label>
|
147 |
-
<frontend_type>select</frontend_type>
|
148 |
-
<source_model>iplogistics/system_config_source_tax_mode</source_model>
|
149 |
-
<sort_order>0</sort_order>
|
150 |
-
<show_in_default>1</show_in_default>
|
151 |
-
<show_in_website>1</show_in_website>
|
152 |
-
<show_in_store>1</show_in_store>
|
153 |
-
</mode>
|
154 |
-
<tax_duty_label translate="label">
|
155 |
-
<label><![CDATA[Tax&Duty Label]]></label>
|
156 |
-
<frontend_type>text</frontend_type>
|
157 |
-
<sort_order>5</sort_order>
|
158 |
-
<show_in_default>1</show_in_default>
|
159 |
-
<show_in_website>1</show_in_website>
|
160 |
-
<show_in_store>1</show_in_store>
|
161 |
-
<depends>
|
162 |
-
<mode>1</mode>
|
163 |
-
</depends>
|
164 |
-
</tax_duty_label>
|
165 |
-
<tax_label translate="label">
|
166 |
-
<label>Tax Label</label>
|
167 |
-
<frontend_type>text</frontend_type>
|
168 |
-
<sort_order>10</sort_order>
|
169 |
-
<show_in_default>1</show_in_default>
|
170 |
-
<show_in_website>1</show_in_website>
|
171 |
-
<show_in_store>1</show_in_store>
|
172 |
-
<depends>
|
173 |
-
<mode>2</mode>
|
174 |
-
</depends>
|
175 |
-
</tax_label>
|
176 |
-
<duty_label translate="label">
|
177 |
-
<label>Duty Label</label>
|
178 |
-
<frontend_type>text</frontend_type>
|
179 |
-
<sort_order>15</sort_order>
|
180 |
-
<show_in_default>1</show_in_default>
|
181 |
-
<show_in_website>1</show_in_website>
|
182 |
-
<show_in_store>1</show_in_store>
|
183 |
-
<depends>
|
184 |
-
<mode>2</mode>
|
185 |
-
</depends>
|
186 |
-
</duty_label>
|
187 |
-
</fields>
|
188 |
</tax>
|
189 |
</groups>
|
190 |
</iparcel>
|
1 |
<?xml version="1.0" encoding="UTF-8"?>
|
2 |
<config>
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
<sections>
|
4 |
<carriers>
|
5 |
<groups>
|
6 |
+
<iparcel>
|
|
|
|
|
|
|
7 |
<show_in_default>1</show_in_default>
|
8 |
<show_in_website>1</show_in_website>
|
9 |
<show_in_store>1</show_in_store>
|
10 |
+
</iparcel>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
11 |
</groups>
|
12 |
</carriers>
|
13 |
<iparcel>
|
14 |
<groups>
|
15 |
<tax translate="label">
|
|
|
|
|
|
|
16 |
<show_in_default>1</show_in_default>
|
17 |
<show_in_website>1</show_in_website>
|
18 |
<show_in_store>1</show_in_store>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
19 |
</tax>
|
20 |
</groups>
|
21 |
</iparcel>
|
app/code/community/Iparcel/Logistics/sql/iplogistics_setup/mysql4-install-1.0.0.php
DELETED
@@ -1,26 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
* Adds default Service Levels to "Methods Names" section of the i-parcel Shipping Method
|
4 |
-
*/
|
5 |
-
$installer = $this;
|
6 |
-
|
7 |
-
$installer->startSetup();
|
8 |
-
|
9 |
-
$data = array(
|
10 |
-
array(
|
11 |
-
'service_id' => 112,
|
12 |
-
'title' => 'i-parcel UPS Express'
|
13 |
-
),
|
14 |
-
array(
|
15 |
-
'service_id' => 115,
|
16 |
-
'title' => 'i-parcel UPS Select'
|
17 |
-
)
|
18 |
-
);
|
19 |
-
Mage::getModel('core/config_data')
|
20 |
-
->setScope('default')
|
21 |
-
->setScopeId(0)
|
22 |
-
->setPath('carriers/i-parcel/name')
|
23 |
-
->setValue(serialize($data))
|
24 |
-
->save();
|
25 |
-
|
26 |
-
$installer->endSetup();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Iparcel/Logistics/sql/iplogistics_setup/mysql4-upgrade-1.0.1-1.0.2.php
DELETED
@@ -1,18 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
|
3 |
-
$installer = $this;
|
4 |
-
|
5 |
-
// Create a table to store tax & duty calculations
|
6 |
-
|
7 |
-
$installer->run("
|
8 |
-
DROP TABLE IF EXISTS {$this->getTable('iplogistics/api_quote')};
|
9 |
-
CREATE TABLE {$this->getTable('iplogistics/api_quote')} (
|
10 |
-
`id` int(11) unsigned NOT NULL auto_increment,
|
11 |
-
`quote_id` varchar(255) NOT NULL,
|
12 |
-
`parcel_id` varchar(255) NOT NULL,
|
13 |
-
`service_levels` varchar(255) NOT NULL,
|
14 |
-
PRIMARY KEY (`id`)
|
15 |
-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
16 |
-
");
|
17 |
-
|
18 |
-
$installer->endSetup();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Iparcel/Logistics/sql/iplogistics_setup/mysql4-upgrade-1.0.3-1.0.4.php
DELETED
@@ -1,12 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
|
3 |
-
$installer = $this;
|
4 |
-
|
5 |
-
// Create a table to store tax & duty calculations
|
6 |
-
|
7 |
-
$installer->run("
|
8 |
-
ALTER TABLE {$this->getTable('iplogistics/api_quote')}
|
9 |
-
MODIFY `service_levels` TEXT
|
10 |
-
");
|
11 |
-
|
12 |
-
$installer->endSetup();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/design/adminhtml/default/default/layout/iparcel.xml
CHANGED
@@ -1,9 +1,29 @@
|
|
1 |
<layout>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2 |
<adminhtml_iparcel_log_index>
|
3 |
<reference name="content">
|
4 |
<block type="iparcel/adminhtml_iparcel_logs" name="iparcel.logs" as="logs" />
|
5 |
</reference>
|
6 |
</adminhtml_iparcel_log_index>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
7 |
<adminhtml_iparcel_sync_ajax>
|
8 |
<block type="adminhtml/page" name="root" output="toHtml" template="page.phtml">
|
9 |
<block type="adminhtml/page_head" name="head" as="head" template="page/head.phtml">
|
@@ -30,4 +50,47 @@
|
|
30 |
<block type="core/template" name="checkitems.sync" template="iparcel/sync/ajax/checkitems.phtml" />
|
31 |
</reference>
|
32 |
</adminhtml_iparcel_sync_ajax_checkitems>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
33 |
</layout>
|
1 |
<layout>
|
2 |
+
<adminhtml_system_config_edit>
|
3 |
+
<reference name="head">
|
4 |
+
<action method="addJs">
|
5 |
+
<name>iparcel/adminhtml/shipping-methods.js</name>
|
6 |
+
</action>
|
7 |
+
</reference>
|
8 |
+
</adminhtml_system_config_edit>
|
9 |
<adminhtml_iparcel_log_index>
|
10 |
<reference name="content">
|
11 |
<block type="iparcel/adminhtml_iparcel_logs" name="iparcel.logs" as="logs" />
|
12 |
</reference>
|
13 |
</adminhtml_iparcel_log_index>
|
14 |
+
<adminhtml_iparcel_shipment_split>
|
15 |
+
<reference name="content">
|
16 |
+
<block type="iparcel/adminhtml_iparcel_shipment_split" name="iparcel_shipment_split">
|
17 |
+
<block type="iparcel/adminhtml_iparcel_shipment_split_form" name="form" template="iparcel/shipment/split/form.phtml">
|
18 |
+
<block type="adminhtml/sales_order_shipment_create_items" name="shipment_items" template="iparcel/shipment/split/items.phtml">
|
19 |
+
<action method="addItemRender"><type>default</type><block>adminhtml/sales_items_renderer_default</block><template>iparcel/shipment/split/renderer/default.phtml</template></action>
|
20 |
+
<action method="addColumnRender"><column>qty</column><block>adminhtml/sales_items_column_qty</block><template>sales/items/column/qty.phtml</template></action>
|
21 |
+
<action method="addColumnRender"><column>name</column><block>adminhtml/sales_items_column_name</block><template>sales/items/column/name.phtml</template></action>
|
22 |
+
</block>
|
23 |
+
</block>
|
24 |
+
</block>
|
25 |
+
</reference>
|
26 |
+
</adminhtml_iparcel_shipment_split>
|
27 |
<adminhtml_iparcel_sync_ajax>
|
28 |
<block type="adminhtml/page" name="root" output="toHtml" template="page.phtml">
|
29 |
<block type="adminhtml/page_head" name="head" as="head" template="page/head.phtml">
|
50 |
<block type="core/template" name="checkitems.sync" template="iparcel/sync/ajax/checkitems.phtml" />
|
51 |
</reference>
|
52 |
</adminhtml_iparcel_sync_ajax_checkitems>
|
53 |
+
|
54 |
+
<adminhtml_sales_order_view>
|
55 |
+
<reference name="order_totals">
|
56 |
+
<block type="adminhtml/sales_order_totals_item" name="iparcel_order_totals_duty" template="iparcel/order/totals/duty.phtml"></block>
|
57 |
+
<block type="adminhtml/sales_order_totals_item" name="iparcel_order_totals_tax" template="iparcel/order/totals/tax.phtml"></block>
|
58 |
+
</reference>
|
59 |
+
</adminhtml_sales_order_view>
|
60 |
+
<adminhtml_sales_order_invoice_new>
|
61 |
+
<reference name="invoice_totals">
|
62 |
+
<block type="adminhtml/sales_order_totals_item" name="iparcel_order_totals_duty" template="iparcel/order/totals/duty.phtml"></block>
|
63 |
+
<block type="adminhtml/sales_order_totals_item" name="iparcel_order_totals_tax" template="iparcel/order/totals/tax.phtml"></block>
|
64 |
+
</reference>
|
65 |
+
</adminhtml_sales_order_invoice_new>
|
66 |
+
<adminhtml_sales_order_invoice_updateqty>
|
67 |
+
<reference name="invoice_totals">
|
68 |
+
<block type="adminhtml/sales_order_totals_item" name="iparcel_order_totals_duty" template="iparcel/order/totals/duty.phtml"></block>
|
69 |
+
<block type="adminhtml/sales_order_totals_item" name="iparcel_order_totals_tax" template="iparcel/order/totals/tax.phtml"></block>
|
70 |
+
</reference>
|
71 |
+
</adminhtml_sales_order_invoice_updateqty>
|
72 |
+
<adminhtml_sales_order_invoice_view>
|
73 |
+
<reference name="invoice_totals">
|
74 |
+
<block type="adminhtml/sales_order_totals_item" name="iparcel_order_totals_duty" template="iparcel/order/totals/duty.phtml"></block>
|
75 |
+
<block type="adminhtml/sales_order_totals_item" name="iparcel_order_totals_tax" template="iparcel/order/totals/tax.phtml"></block>
|
76 |
+
</reference>
|
77 |
+
</adminhtml_sales_order_invoice_view>
|
78 |
+
<adminhtml_sales_order_creditmemo_new>
|
79 |
+
<reference name="creditmemo_totals">
|
80 |
+
<block type="adminhtml/sales_order_totals_item" name="iparcel_order_totals_duty" template="iparcel/order/totals/duty.phtml"></block>
|
81 |
+
<block type="adminhtml/sales_order_totals_item" name="iparcel_order_totals_tax" template="iparcel/order/totals/tax.phtml"></block>
|
82 |
+
</reference>
|
83 |
+
</adminhtml_sales_order_creditmemo_new>
|
84 |
+
<adminhtml_sales_order_creditmemo_updateqty>
|
85 |
+
<reference name="creditmemo_totals">
|
86 |
+
<block type="adminhtml/sales_order_totals_item" name="iparcel_order_totals_duty" template="iparcel/order/totals/duty.phtml"></block>
|
87 |
+
<block type="adminhtml/sales_order_totals_item" name="iparcel_order_totals_tax" template="iparcel/order/totals/tax.phtml"></block>
|
88 |
+
</reference>
|
89 |
+
</adminhtml_sales_order_creditmemo_updateqty>
|
90 |
+
<adminhtml_sales_order_creditmemo_view>
|
91 |
+
<reference name="creditmemo_totals">
|
92 |
+
<block type="adminhtml/sales_order_totals_item" name="iparcel_order_totals_duty" template="iparcel/order/totals/duty.phtml"></block>
|
93 |
+
<block type="adminhtml/sales_order_totals_item" name="iparcel_order_totals_tax" template="iparcel/order/totals/tax.phtml"></block>
|
94 |
+
</reference>
|
95 |
+
</adminhtml_sales_order_creditmemo_view>
|
96 |
</layout>
|
app/design/adminhtml/default/default/layout/iplogistics.xml
DELETED
@@ -1,72 +0,0 @@
|
|
1 |
-
<layout>
|
2 |
-
<adminhtml_system_config_edit>
|
3 |
-
<reference name="head">
|
4 |
-
<action method="addJs">
|
5 |
-
<name>iparcel-logistics/adminhtml/shipping-methods.js</name>
|
6 |
-
</action>
|
7 |
-
</reference>
|
8 |
-
</adminhtml_system_config_edit>
|
9 |
-
|
10 |
-
<adminhtml_iplogistics_shipment_split>
|
11 |
-
<reference name="content">
|
12 |
-
<block type="iplogistics/adminhtml_iplogistics_shipment_split" name="iplogistics_shipment_split">
|
13 |
-
<block type="iplogistics/adminhtml_iplogistics_shipment_split_form" name="form" template="iplogistics/shipment/split/form.phtml">
|
14 |
-
<block type="adminhtml/sales_order_shipment_create_items" name="shipment_items" template="iplogistics/shipment/split/items.phtml">
|
15 |
-
<action method="addItemRender"><type>default</type><block>adminhtml/sales_items_renderer_default</block><template>iplogistics/shipment/split/renderer/default.phtml</template></action>
|
16 |
-
<action method="addColumnRender"><column>qty</column><block>adminhtml/sales_items_column_qty</block><template>sales/items/column/qty.phtml</template></action>
|
17 |
-
<action method="addColumnRender"><column>name</column><block>adminhtml/sales_items_column_name</block><template>sales/items/column/name.phtml</template></action>
|
18 |
-
</block>
|
19 |
-
</block>
|
20 |
-
</block>
|
21 |
-
</reference>
|
22 |
-
</adminhtml_iplogistics_shipment_split>
|
23 |
-
|
24 |
-
<adminhtml_sales_order_view>
|
25 |
-
<reference name="order_totals">
|
26 |
-
<block type="adminhtml/sales_order_totals_item" name="iplogistics_order_totals_duty" template="iplogistics/order/totals/duty.phtml"></block>
|
27 |
-
<block type="adminhtml/sales_order_totals_item" name="iplogistics_order_totals_tax" template="iplogistics/order/totals/tax.phtml"></block>
|
28 |
-
</reference>
|
29 |
-
</adminhtml_sales_order_view>
|
30 |
-
|
31 |
-
<adminhtml_sales_order_invoice_new>
|
32 |
-
<reference name="invoice_totals">
|
33 |
-
<block type="adminhtml/sales_order_totals_item" name="iplogistics_order_totals_duty" template="iplogistics/order/totals/duty.phtml"></block>
|
34 |
-
<block type="adminhtml/sales_order_totals_item" name="iplogistics_order_totals_tax" template="iplogistics/order/totals/tax.phtml"></block>
|
35 |
-
</reference>
|
36 |
-
</adminhtml_sales_order_invoice_new>
|
37 |
-
|
38 |
-
<adminhtml_sales_order_invoice_updateqty>
|
39 |
-
<reference name="invoice_totals">
|
40 |
-
<block type="adminhtml/sales_order_totals_item" name="iplogistics_order_totals_duty" template="iplogistics/order/totals/duty.phtml"></block>
|
41 |
-
<block type="adminhtml/sales_order_totals_item" name="iplogistics_order_totals_tax" template="iplogistics/order/totals/tax.phtml"></block>
|
42 |
-
</reference>
|
43 |
-
</adminhtml_sales_order_invoice_updateqty>
|
44 |
-
|
45 |
-
<adminhtml_sales_order_invoice_view>
|
46 |
-
<reference name="invoice_totals">
|
47 |
-
<block type="adminhtml/sales_order_totals_item" name="iplogistics_order_totals_duty" template="iplogistics/order/totals/duty.phtml"></block>
|
48 |
-
<block type="adminhtml/sales_order_totals_item" name="iplogistics_order_totals_tax" template="iplogistics/order/totals/tax.phtml"></block>
|
49 |
-
</reference>
|
50 |
-
</adminhtml_sales_order_invoice_view>
|
51 |
-
|
52 |
-
<adminhtml_sales_order_creditmemo_new>
|
53 |
-
<reference name="creditmemo_totals">
|
54 |
-
<block type="adminhtml/sales_order_totals_item" name="iplogistics_order_totals_duty" template="iplogistics/order/totals/duty.phtml"></block>
|
55 |
-
<block type="adminhtml/sales_order_totals_item" name="iplogistics_order_totals_tax" template="iplogistics/order/totals/tax.phtml"></block>
|
56 |
-
</reference>
|
57 |
-
</adminhtml_sales_order_creditmemo_new>
|
58 |
-
|
59 |
-
<adminhtml_sales_order_creditmemo_updateqty>
|
60 |
-
<reference name="creditmemo_totals">
|
61 |
-
<block type="adminhtml/sales_order_totals_item" name="iplogistics_order_totals_duty" template="iplogistics/order/totals/duty.phtml"></block>
|
62 |
-
<block type="adminhtml/sales_order_totals_item" name="iplogistics_order_totals_tax" template="iplogistics/order/totals/tax.phtml"></block>
|
63 |
-
</reference>
|
64 |
-
</adminhtml_sales_order_creditmemo_updateqty>
|
65 |
-
|
66 |
-
<adminhtml_sales_order_creditmemo_view>
|
67 |
-
<reference name="creditmemo_totals">
|
68 |
-
<block type="adminhtml/sales_order_totals_item" name="iplogistics_order_totals_duty" template="iplogistics/order/totals/duty.phtml"></block>
|
69 |
-
<block type="adminhtml/sales_order_totals_item" name="iplogistics_order_totals_tax" template="iplogistics/order/totals/tax.phtml"></block>
|
70 |
-
</reference>
|
71 |
-
</adminhtml_sales_order_creditmemo_view>
|
72 |
-
</layout>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/design/adminhtml/default/default/template/{iplogistics → iparcel}/order/totals/duty.phtml
RENAMED
@@ -1,7 +1,7 @@
|
|
1 |
<?php $this->setPriceDataObject($this->getSource()) ?>
|
2 |
<?php if ((float) $this->getSource()->getIparcelDutyAmount()): ?>
|
3 |
<tr>
|
4 |
-
<td class="label"><?php echo Mage::helper('
|
5 |
<td>
|
6 |
<?php echo $this->displayPrices($this->getSource()->getBaseIparcelDutyAmount(), $this->getSource()->getIparcelDutyAmount()); ?>
|
7 |
</td>
|
1 |
<?php $this->setPriceDataObject($this->getSource()) ?>
|
2 |
<?php if ((float) $this->getSource()->getIparcelDutyAmount()): ?>
|
3 |
<tr>
|
4 |
+
<td class="label"><?php echo Mage::helper('iparcel')->getDutyLabel(); ?></td>
|
5 |
<td>
|
6 |
<?php echo $this->displayPrices($this->getSource()->getBaseIparcelDutyAmount(), $this->getSource()->getIparcelDutyAmount()); ?>
|
7 |
</td>
|
app/design/adminhtml/default/default/template/{iplogistics → iparcel}/order/totals/tax.phtml
RENAMED
@@ -1,7 +1,7 @@
|
|
1 |
<?php $this->setPriceDataObject($this->getSource()) ?>
|
2 |
<?php if ((float) $this->getSource()->getIparcelTaxAmount()): ?>
|
3 |
<tr>
|
4 |
-
<td class="label"><?php echo Mage::helper('
|
5 |
<td>
|
6 |
<?php echo $this->displayPrices($this->getSource()->getBaseIparcelTaxAmount(), $this->getSource()->getIparcelTaxAmount()); ?>
|
7 |
</td>
|
1 |
<?php $this->setPriceDataObject($this->getSource()) ?>
|
2 |
<?php if ((float) $this->getSource()->getIparcelTaxAmount()): ?>
|
3 |
<tr>
|
4 |
+
<td class="label"><?php echo Mage::helper('iparcel')->getTaxLabel(); ?></td>
|
5 |
<td>
|
6 |
<?php echo $this->displayPrices($this->getSource()->getBaseIparcelTaxAmount(), $this->getSource()->getIparcelTaxAmount()); ?>
|
7 |
</td>
|
app/design/adminhtml/default/default/template/iplogistics/shipment/split/form.phtml
DELETED
@@ -1,20 +0,0 @@
|
|
1 |
-
<form id="edit_form" method="post" action="<?php echo $this->getSaveUrl() ?>">
|
2 |
-
<?php echo $this->getBlockHtml('formkey')?>
|
3 |
-
<input type="hidden" name="shipment[info][shipment_id]" value="<?php echo $this->getShipment()->getId() ?>" />
|
4 |
-
|
5 |
-
<div class="entry-edit">
|
6 |
-
<div class="entry-edit-head">
|
7 |
-
<h4 class="icon-head head-products"><?php echo Mage::helper('sales')->__('Items to Split into Seperate Shipment') ?></h4>
|
8 |
-
</div>
|
9 |
-
</div>
|
10 |
-
|
11 |
-
<div id="ship_items_container">
|
12 |
-
<?php echo $this->getItemsHtml() ?>
|
13 |
-
</div>
|
14 |
-
</form>
|
15 |
-
<?php echo $this->getChildHtml('shipment_packaging') ?>
|
16 |
-
<script type="text/javascript">
|
17 |
-
//<![CDATA[
|
18 |
-
editForm = new varienForm('edit_form');
|
19 |
-
//]]>
|
20 |
-
</script>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/design/adminhtml/default/default/template/iplogistics/shipment/split/items.phtml
DELETED
@@ -1,67 +0,0 @@
|
|
1 |
-
<div class="grid np">
|
2 |
-
<div class="hor-scroll">
|
3 |
-
<table cellspacing="0" class="data order-tables">
|
4 |
-
<col />
|
5 |
-
<col width="1" />
|
6 |
-
<col width="1" />
|
7 |
-
<?php if (!$this->canShipPartiallyItem()): ?>
|
8 |
-
<col width="20" />
|
9 |
-
<?php endif; ?>
|
10 |
-
<thead>
|
11 |
-
<tr class="headings">
|
12 |
-
<th><?php echo $this->helper('sales')->__('Product') ?></th>
|
13 |
-
<th class="a-center"><?php echo $this->helper('sales')->__('Qty') ?></th>
|
14 |
-
<th<?php if ($this->isShipmentRegular()): ?> class="last"<?php endif; ?>><span class="nobr"><?php echo $this->helper('iplogistics')->__('Qty to Split') ?></span></th>
|
15 |
-
</tr>
|
16 |
-
</thead>
|
17 |
-
<?php $_items = $this->getShipment()->getAllItems() ?>
|
18 |
-
<?php $_i=0;foreach ($_items as $_item): if ($_item->getOrderItem()->getIsVirtual() || $_item->getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
|
19 |
-
<tbody class="<?php echo $_i%2?'odd':'even' ?>">
|
20 |
-
<?php echo $this->getItemHtml($_item) ?>
|
21 |
-
<?php echo $this->getItemExtraInfoHtml($_item->getOrderItem()) ?>
|
22 |
-
</tbody>
|
23 |
-
<?php endforeach; ?>
|
24 |
-
</table>
|
25 |
-
</div>
|
26 |
-
</div>
|
27 |
-
<br />
|
28 |
-
|
29 |
-
<div class="box-right entry-edit">
|
30 |
-
<div class="order-totals">
|
31 |
-
<div class="order-totals-bottom">
|
32 |
-
<div class="a-right">
|
33 |
-
<?php echo $this->getChildHtml('submit_button') ?>
|
34 |
-
</div>
|
35 |
-
</div>
|
36 |
-
</div>
|
37 |
-
</div>
|
38 |
-
|
39 |
-
<div class="clear"></div>
|
40 |
-
<script type="text/javascript">
|
41 |
-
//<![CDATA[
|
42 |
-
function submitShipment(btn) {
|
43 |
-
|
44 |
-
if (!validQtyItems()) {
|
45 |
-
return;
|
46 |
-
}
|
47 |
-
|
48 |
-
if(editForm.submit()) {
|
49 |
-
disableElements('submit-button');
|
50 |
-
}
|
51 |
-
}
|
52 |
-
|
53 |
-
function validQtyItems() {
|
54 |
-
var valid = true;
|
55 |
-
var errorMessage = '<?php echo Mage::helper('core')->jsQuoteEscape($this->helper('iplogistics')->__('Invalid value(s) for Qty to Split')) ?>';
|
56 |
-
$$('.qty-item').each(function(item) {
|
57 |
-
var val = parseFloat(item.value);
|
58 |
-
if (isNaN(val) || val < 0) {
|
59 |
-
valid = false;
|
60 |
-
alert(errorMessage);
|
61 |
-
throw $break;
|
62 |
-
}
|
63 |
-
});
|
64 |
-
return valid;
|
65 |
-
}
|
66 |
-
//]]>
|
67 |
-
</script>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/design/adminhtml/default/default/template/iplogistics/shipment/split/renderer/default.phtml
DELETED
@@ -1,19 +0,0 @@
|
|
1 |
-
<?php $_item = $this->getItem() ?>
|
2 |
-
<tr class="border">
|
3 |
-
<td><?php echo $this->getColumnHtml($_item, 'name') ?></td>
|
4 |
-
<td><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
|
5 |
-
|
6 |
-
<td class="last a-center">
|
7 |
-
<?php if ($this->canShipPartiallyItem()): ?>
|
8 |
-
<input type="text" class="input-text qty-item" name="shipment[items][<?php echo $_item->getOrderItemId() ?>]" value="0" />
|
9 |
-
<?php else: ?>
|
10 |
-
<?php echo $_item->getQty()*1 ?>
|
11 |
-
<?php endif; ?>
|
12 |
-
</td>
|
13 |
-
<?php if (!$this->canShipPartiallyItem()): ?>
|
14 |
-
<td class="a-center last">
|
15 |
-
<input type="hidden" name="shipment[items][<?php echo $_item->getOrderItemId() ?>]" value="0" />
|
16 |
-
<input type="checkbox" name="shipment[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>" checked />
|
17 |
-
</td>
|
18 |
-
<?php endif; ?>
|
19 |
-
</tr>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/design/frontend/base/default/layout/iparcel.xml
ADDED
@@ -0,0 +1,102 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0"?>
|
2 |
+
<layout>
|
3 |
+
<default>
|
4 |
+
<reference name="head">
|
5 |
+
<block type="iparcel/html_head_jquery" name="jquery" template="iparcel/html/head/jquery.phtml" />
|
6 |
+
<block type="iparcel/html_head_iparcel" name="html.head.iparcel" template="iparcel/html/head/iparcel.phtml" />
|
7 |
+
</reference>
|
8 |
+
</default>
|
9 |
+
<catalog_product_view>
|
10 |
+
<reference name="head">
|
11 |
+
<action method="addJs"><script>iparcel/lib.js</script></action>
|
12 |
+
<block type="iparcel/html_head_post" name="iparcel_post" template="iparcel/html/head/post.phtml" />
|
13 |
+
<block type="iparcel/catalog_product" name="iparcel_sku" template="iparcel/post.phtml" />
|
14 |
+
</reference>
|
15 |
+
</catalog_product_view>
|
16 |
+
<catalog_category_view>
|
17 |
+
<reference name="head">
|
18 |
+
<action method="addJs"><script>iparcel/lib.js</script></action>
|
19 |
+
<block type="iparcel/html_head_post" name="iparcel_post" template="iparcel/html/head/post.phtml" />
|
20 |
+
<block type="iparcel/catalog_product_list" name="iparcel_sku.list" template="iparcel/post/list.phtml" />
|
21 |
+
</reference>
|
22 |
+
</catalog_category_view>
|
23 |
+
<catalogsearch_result_index>
|
24 |
+
<reference name="head">
|
25 |
+
<action method="addJs"><script>iparcel/lib.js</script></action>
|
26 |
+
<block type="iparcel/html_head_post" name="iparcel_post" template="iparcel/html/head/post.phtml" />
|
27 |
+
<block type="iparcel/catalogsearch_result" name="iparcel_sku.list" template="iparcel/post/list.phtml">
|
28 |
+
<block type="catalog/product_list" name="search_result_list" template="catalog/product/list.phtml"/>
|
29 |
+
<action method="setListCollection"/>
|
30 |
+
</block>
|
31 |
+
</reference>
|
32 |
+
</catalogsearch_result_index>
|
33 |
+
<catalogsearch_advanced_result>
|
34 |
+
<reference name="head">
|
35 |
+
<action method="addJs"><script>iparcel/lib.js</script></action>
|
36 |
+
<block type="iparcel/html_head_post" name="iparcel_post" template="iparcel/html/head/post.phtml" />
|
37 |
+
<block type="iparcel/catalogsearch_advanced_result" name="iparcel_sku.list" template="iparcel/post/list.phtml" />
|
38 |
+
</reference>
|
39 |
+
</catalogsearch_advanced_result>
|
40 |
+
<sales_order_view>
|
41 |
+
<reference name="order_totals">
|
42 |
+
<block type="iparcel/sales_order_totals_duty" name="iparcel_sales_order_totals_duty"></block>
|
43 |
+
<block type="iparcel/sales_order_totals_tax" name="iparcel_sales_order_totals_tax"></block>
|
44 |
+
</reference>
|
45 |
+
</sales_order_view>
|
46 |
+
|
47 |
+
<sales_order_print>
|
48 |
+
<reference name="order_totals">
|
49 |
+
<block type="iparcel/sales_order_totals_duty" name="iparcel_sales_order_totals_duty"></block>
|
50 |
+
<block type="iparcel/sales_order_totals_tax" name="iparcel_sales_order_totals_tax"></block>
|
51 |
+
</reference>
|
52 |
+
</sales_order_print>
|
53 |
+
|
54 |
+
<sales_email_order_items>
|
55 |
+
<reference name="order_totals">
|
56 |
+
<block type="iparcel/sales_order_totals_duty" name="iparcel_sales_order_totals_duty"></block>
|
57 |
+
<block type="iparcel/sales_order_totals_tax" name="iparcel_sales_order_totals_tax"></block>
|
58 |
+
</reference>
|
59 |
+
</sales_email_order_items>
|
60 |
+
|
61 |
+
<sales_order_invoice>
|
62 |
+
<reference name="invoice_totals">
|
63 |
+
<block type="iparcel/sales_order_totals_duty" name="iparcel_sales_order_totals_duty"></block>
|
64 |
+
<block type="iparcel/sales_order_totals_tax" name="iparcel_sales_order_totals_tax"></block>
|
65 |
+
</reference>
|
66 |
+
</sales_order_invoice>
|
67 |
+
|
68 |
+
<sales_order_printinvoice>
|
69 |
+
<reference name="invoice_totals">
|
70 |
+
<block type="iparcel/sales_order_totals_duty" name="iparcel_sales_order_totals_duty"></block>
|
71 |
+
<block type="iparcel/sales_order_totals_tax" name="iparcel_sales_order_totals_tax"></block>
|
72 |
+
</reference>
|
73 |
+
</sales_order_printinvoice>
|
74 |
+
|
75 |
+
<sales_email_order_invoice_items>
|
76 |
+
<reference name="invoice_totals">
|
77 |
+
<block type="iparcel/sales_order_totals_duty" name="iparcel_sales_order_totals_duty"></block>
|
78 |
+
<block type="iparcel/sales_order_totals_tax" name="iparcel_sales_order_totals_tax"></block>
|
79 |
+
</reference>
|
80 |
+
</sales_email_order_invoice_items>
|
81 |
+
|
82 |
+
<sales_order_creditmemo>
|
83 |
+
<reference name="creditmemo_totals">
|
84 |
+
<block type="iparcel/sales_order_totals_duty" name="iparcel_sales_order_totals_duty"></block>
|
85 |
+
<block type="iparcel/sales_order_totals_tax" name="iparcel_sales_order_totals_tax"></block>
|
86 |
+
</reference>
|
87 |
+
</sales_order_creditmemo>
|
88 |
+
|
89 |
+
<sales_order_printcreditmemo>
|
90 |
+
<reference name="creditmemo_totals">
|
91 |
+
<block type="iparcel/sales_order_totals_duty" name="iparcel_sales_order_totals_duty"></block>
|
92 |
+
<block type="iparcel/sales_order_totals_tax" name="iparcel_sales_order_totals_tax"></block>
|
93 |
+
</reference>
|
94 |
+
</sales_order_printcreditmemo>
|
95 |
+
|
96 |
+
<sales_email_order_creditmemo_items>
|
97 |
+
<reference name="creditmemo_totals">
|
98 |
+
<block type="iparcel/sales_order_totals_duty" name="iparcel_sales_order_totals_duty"></block>
|
99 |
+
<block type="iparcel/sales_order_totals_tax" name="iparcel_sales_order_totals_tax"></block>
|
100 |
+
</reference>
|
101 |
+
</sales_email_order_creditmemo_items>
|
102 |
+
</layout>
|
app/design/frontend/base/default/layout/iplogistics.xml
DELETED
@@ -1,65 +0,0 @@
|
|
1 |
-
<?xml version="1.0"?>
|
2 |
-
<layout>
|
3 |
-
<sales_order_view>
|
4 |
-
<reference name="order_totals">
|
5 |
-
<block type="iplogistics/sales_order_totals_duty" name="iplogistics_sales_order_totals_duty"></block>
|
6 |
-
<block type="iplogistics/sales_order_totals_tax" name="iplogistics_sales_order_totals_tax"></block>
|
7 |
-
</reference>
|
8 |
-
</sales_order_view>
|
9 |
-
|
10 |
-
<sales_order_print>
|
11 |
-
<reference name="order_totals">
|
12 |
-
<block type="iplogistics/sales_order_totals_duty" name="iplogistics_sales_order_totals_duty"></block>
|
13 |
-
<block type="iplogistics/sales_order_totals_tax" name="iplogistics_sales_order_totals_tax"></block>
|
14 |
-
</reference>
|
15 |
-
</sales_order_print>
|
16 |
-
|
17 |
-
<sales_email_order_items>
|
18 |
-
<reference name="order_totals">
|
19 |
-
<block type="iplogistics/sales_order_totals_duty" name="iplogistics_sales_order_totals_duty"></block>
|
20 |
-
<block type="iplogistics/sales_order_totals_tax" name="iplogistics_sales_order_totals_tax"></block>
|
21 |
-
</reference>
|
22 |
-
</sales_email_order_items>
|
23 |
-
|
24 |
-
<sales_order_invoice>
|
25 |
-
<reference name="invoice_totals">
|
26 |
-
<block type="iplogistics/sales_order_totals_duty" name="iplogistics_sales_order_totals_duty"></block>
|
27 |
-
<block type="iplogistics/sales_order_totals_tax" name="iplogistics_sales_order_totals_tax"></block>
|
28 |
-
</reference>
|
29 |
-
</sales_order_invoice>
|
30 |
-
|
31 |
-
<sales_order_printinvoice>
|
32 |
-
<reference name="invoice_totals">
|
33 |
-
<block type="iplogistics/sales_order_totals_duty" name="iplogistics_sales_order_totals_duty"></block>
|
34 |
-
<block type="iplogistics/sales_order_totals_tax" name="iplogistics_sales_order_totals_tax"></block>
|
35 |
-
</reference>
|
36 |
-
</sales_order_printinvoice>
|
37 |
-
|
38 |
-
<sales_email_order_invoice_items>
|
39 |
-
<reference name="invoice_totals">
|
40 |
-
<block type="iplogistics/sales_order_totals_duty" name="iplogistics_sales_order_totals_duty"></block>
|
41 |
-
<block type="iplogistics/sales_order_totals_tax" name="iplogistics_sales_order_totals_tax"></block>
|
42 |
-
</reference>
|
43 |
-
</sales_email_order_invoice_items>
|
44 |
-
|
45 |
-
<sales_order_creditmemo>
|
46 |
-
<reference name="creditmemo_totals">
|
47 |
-
<block type="iplogistics/sales_order_totals_duty" name="iplogistics_sales_order_totals_duty"></block>
|
48 |
-
<block type="iplogistics/sales_order_totals_tax" name="iplogistics_sales_order_totals_tax"></block>
|
49 |
-
</reference>
|
50 |
-
</sales_order_creditmemo>
|
51 |
-
|
52 |
-
<sales_order_printcreditmemo>
|
53 |
-
<reference name="creditmemo_totals">
|
54 |
-
<block type="iplogistics/sales_order_totals_duty" name="iplogistics_sales_order_totals_duty"></block>
|
55 |
-
<block type="iplogistics/sales_order_totals_tax" name="iplogistics_sales_order_totals_tax"></block>
|
56 |
-
</reference>
|
57 |
-
</sales_order_printcreditmemo>
|
58 |
-
|
59 |
-
<sales_email_order_creditmemo_items>
|
60 |
-
<reference name="creditmemo_totals">
|
61 |
-
<block type="iplogistics/sales_order_totals_duty" name="iplogistics_sales_order_totals_duty"></block>
|
62 |
-
<block type="iplogistics/sales_order_totals_tax" name="iplogistics_sales_order_totals_tax"></block>
|
63 |
-
</reference>
|
64 |
-
</sales_email_order_creditmemo_items>
|
65 |
-
</layout>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/design/frontend/base/default/template/iparcel/html/head/iparcel.phtml
ADDED
@@ -0,0 +1,14 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* @category design
|
4 |
+
* @package Iparcel_GlobaleCommerce
|
5 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
6 |
+
* @class Iparcel_GlobaleCommerce_Block_Html_Head_Jquery
|
7 |
+
*/
|
8 |
+
$helper = Mage::helper('iparcel');
|
9 |
+
?>
|
10 |
+
<?php if($this->getFlag()): ?>
|
11 |
+
<script type="text/javascript" src="<?php echo $helper->getScriptUrl(); ?>JavaScript/Merchant/<?php echo $helper->getCustomerId(); ?>/1"></script>
|
12 |
+
<script type="text/javascript">var ipar_is_mage = true;</script>
|
13 |
+
<link rel="stylesheet" type="text/css" href="<?php echo $helper->getScriptUrl(); ?>CSS/Merchant/<?php echo $helper->getCustomerId(); ?>/1" />
|
14 |
+
<?php endif; ?>
|
app/design/frontend/base/default/template/iparcel/html/head/jquery.phtml
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* @category design
|
4 |
+
* @package Iparcel_GlobaleCommerce
|
5 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
6 |
+
* @class Iparcel_GlobaleCommerce_Block_Html_Head_Jquery
|
7 |
+
*/
|
8 |
+
?>
|
9 |
+
<?php if($this->getFlag()): ?>
|
10 |
+
<script type="text/javascript" src="<?php echo Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_JS); ?>iparcel/jQuery.js"></script>
|
11 |
+
<script type="text/javascript">jQuery.noConflict();</script>
|
12 |
+
<?php endif; ?>
|
app/design/frontend/base/default/template/iparcel/html/head/post.phtml
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* @category design
|
4 |
+
* @package Iparcel_GlobaleCommerce
|
5 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
6 |
+
* @class Iparcel_GlobaleCommerce_Block_Html_Head_Post
|
7 |
+
*/
|
8 |
+
?>
|
9 |
+
|
10 |
+
<?php foreach($this->getScript() as $script):?>
|
11 |
+
<script type="text/javascript" src="<?php echo Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_JS).$script; ?>"></script>
|
12 |
+
<?php endforeach;?>
|
app/design/frontend/base/default/template/iparcel/post.phtml
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* @category design
|
4 |
+
* @package Iparcel_GlobaleCommerce
|
5 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
6 |
+
* @class Iparcel_GlobaleCommerce_Block_Catalog_Product
|
7 |
+
*/
|
8 |
+
?>
|
9 |
+
<script type="text/javascript">
|
10 |
+
iparcelPost.single('<?php echo $this->getProduct()->getSku(); ?>', '<?php echo substr(Mage::getBaseUrl(),5); ?>', '<?php echo $this->getStock(); ?>');
|
11 |
+
</script>
|
app/design/frontend/base/default/template/iparcel/post/list.phtml
ADDED
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* @category design
|
4 |
+
* @package Iparcel_GlobaleCommerce
|
5 |
+
* @author Bobby Burden <bburden@i-parcel.com>
|
6 |
+
* @class Iparcel_GlobaleCommerce_Block_Catalog_Product_List
|
7 |
+
*/
|
8 |
+
?>
|
9 |
+
<?php
|
10 |
+
$_productCollection = $this->getLoadedProductCollection();
|
11 |
+
$helper = Mage::helper('iparcel')
|
12 |
+
?>
|
13 |
+
<script type="text/javascript">
|
14 |
+
iparcelPost.sku_list({
|
15 |
+
<?php foreach ($_productCollection as $_product): ?>
|
16 |
+
"<?php echo $helper->jsEscape($_product->getSku()); ?>": "<?php echo $helper->jsEscape($_product->getName()); ?>",
|
17 |
+
<?php endforeach; ?>
|
18 |
+
});
|
19 |
+
iparcelPost.stock_list({
|
20 |
+
<?php foreach ($_productCollection as $_product): ?>
|
21 |
+
"<?php echo $helper->jsEscape($_product->getName()); ?>": "<?php echo $this->getStock($_product); ?>",
|
22 |
+
<?php endforeach; ?>
|
23 |
+
});
|
24 |
+
</script>
|
app/locale/en_US/iparcel.csv
ADDED
@@ -0,0 +1,5 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
"%s (Shipping Price: %s Duty: %s Tax: %s)","%s (Shipping Price: %s Duty: %s Tax: %s)"
|
2 |
+
"Tax","Tax"
|
3 |
+
"Duty","Duty"
|
4 |
+
"Tax & Duty","Tax & Duty"
|
5 |
+
"Default box","Default box"
|
js/{iparcel-logistics → iparcel}/adminhtml/shipping-methods.js
RENAMED
File without changes
|
js/iparcel/jQuery.js
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
/*! jQuery v1.11.0 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
|
2 |
+
!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k="".trim,l={},m="1.11.0",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(l.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:k&&!k.call("\ufeff\xa0")?function(a){return null==a?"":k.call(a)}:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||n.guid++,e):void 0},now:function(){return+new Date},support:l}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="sizzle"+-new Date,t=a.document,u=0,v=0,w=eb(),x=eb(),y=eb(),z=function(a,b){return a===b&&(j=!0),0},A="undefined",B=1<<31,C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=D.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",M=L.replace("w","w#"),N="\\["+K+"*("+L+")"+K+"*(?:([*^$|!~]?=)"+K+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+M+")|)|)"+K+"*\\]",O=":("+L+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+N.replace(3,8)+")*)|.*)\\)|)",P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(O),U=new RegExp("^"+M+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L.replace("w","w*")+")"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=/'|\\/g,ab=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),bb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{G.apply(D=H.call(t.childNodes),t.childNodes),D[t.childNodes.length].nodeType}catch(cb){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function db(a,b,d,e){var f,g,h,i,j,m,p,q,u,v;if((b?b.ownerDocument||b:t)!==l&&k(b),b=b||l,d=d||[],!a||"string"!=typeof a)return d;if(1!==(i=b.nodeType)&&9!==i)return[];if(n&&!e){if(f=Z.exec(a))if(h=f[1]){if(9===i){if(g=b.getElementById(h),!g||!g.parentNode)return d;if(g.id===h)return d.push(g),d}else if(b.ownerDocument&&(g=b.ownerDocument.getElementById(h))&&r(b,g)&&g.id===h)return d.push(g),d}else{if(f[2])return G.apply(d,b.getElementsByTagName(a)),d;if((h=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(h)),d}if(c.qsa&&(!o||!o.test(a))){if(q=p=s,u=b,v=9===i&&a,1===i&&"object"!==b.nodeName.toLowerCase()){m=ob(a),(p=b.getAttribute("id"))?q=p.replace(_,"\\$&"):b.setAttribute("id",q),q="[id='"+q+"'] ",j=m.length;while(j--)m[j]=q+pb(m[j]);u=$.test(a)&&mb(b.parentNode)||b,v=m.join(",")}if(v)try{return G.apply(d,u.querySelectorAll(v)),d}catch(w){}finally{p||b.removeAttribute("id")}}}return xb(a.replace(P,"$1"),b,d,e)}function eb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function fb(a){return a[s]=!0,a}function gb(a){var b=l.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function hb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function ib(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||B)-(~a.sourceIndex||B);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function jb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function kb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function lb(a){return fb(function(b){return b=+b,fb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function mb(a){return a&&typeof a.getElementsByTagName!==A&&a}c=db.support={},f=db.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},k=db.setDocument=function(a){var b,e=a?a.ownerDocument||a:t,g=e.defaultView;return e!==l&&9===e.nodeType&&e.documentElement?(l=e,m=e.documentElement,n=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){k()},!1):g.attachEvent&&g.attachEvent("onunload",function(){k()})),c.attributes=gb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=gb(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(e.getElementsByClassName)&&gb(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=gb(function(a){return m.appendChild(a).id=s,!e.getElementsByName||!e.getElementsByName(s).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==A&&n){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){var c=typeof a.getAttributeNode!==A&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==A?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==A&&n?b.getElementsByClassName(a):void 0},p=[],o=[],(c.qsa=Y.test(e.querySelectorAll))&&(gb(function(a){a.innerHTML="<select t=''><option selected=''></option></select>",a.querySelectorAll("[t^='']").length&&o.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||o.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll(":checked").length||o.push(":checked")}),gb(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&o.push("name"+K+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||o.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),o.push(",.*:")})),(c.matchesSelector=Y.test(q=m.webkitMatchesSelector||m.mozMatchesSelector||m.oMatchesSelector||m.msMatchesSelector))&&gb(function(a){c.disconnectedMatch=q.call(a,"div"),q.call(a,"[s!='']:x"),p.push("!=",O)}),o=o.length&&new RegExp(o.join("|")),p=p.length&&new RegExp(p.join("|")),b=Y.test(m.compareDocumentPosition),r=b||Y.test(m.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},z=b?function(a,b){if(a===b)return j=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===t&&r(t,a)?-1:b===e||b.ownerDocument===t&&r(t,b)?1:i?I.call(i,a)-I.call(i,b):0:4&d?-1:1)}:function(a,b){if(a===b)return j=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],k=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:i?I.call(i,a)-I.call(i,b):0;if(f===g)return ib(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)k.unshift(c);while(h[d]===k[d])d++;return d?ib(h[d],k[d]):h[d]===t?-1:k[d]===t?1:0},e):l},db.matches=function(a,b){return db(a,null,null,b)},db.matchesSelector=function(a,b){if((a.ownerDocument||a)!==l&&k(a),b=b.replace(S,"='$1']"),!(!c.matchesSelector||!n||p&&p.test(b)||o&&o.test(b)))try{var d=q.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return db(b,l,null,[a]).length>0},db.contains=function(a,b){return(a.ownerDocument||a)!==l&&k(a),r(a,b)},db.attr=function(a,b){(a.ownerDocument||a)!==l&&k(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!n):void 0;return void 0!==f?f:c.attributes||!n?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},db.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},db.uniqueSort=function(a){var b,d=[],e=0,f=0;if(j=!c.detectDuplicates,i=!c.sortStable&&a.slice(0),a.sort(z),j){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return i=null,a},e=db.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=db.selectors={cacheLength:50,createPseudo:fb,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ab,bb),a[3]=(a[4]||a[5]||"").replace(ab,bb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||db.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&db.error(a[0]),a},PSEUDO:function(a){var b,c=!a[5]&&a[2];return V.CHILD.test(a[0])?null:(a[3]&&void 0!==a[4]?a[2]=a[4]:c&&T.test(c)&&(b=ob(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ab,bb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=w[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&w(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==A&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=db.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),t=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&t){k=q[s]||(q[s]={}),j=k[a]||[],n=j[0]===u&&j[1],m=j[0]===u&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[u,n,m];break}}else if(t&&(j=(b[s]||(b[s]={}))[a])&&j[0]===u)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(t&&((l[s]||(l[s]={}))[a]=[u,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||db.error("unsupported pseudo: "+a);return e[s]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?fb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:fb(function(a){var b=[],c=[],d=g(a.replace(P,"$1"));return d[s]?fb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:fb(function(a){return function(b){return db(a,b).length>0}}),contains:fb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:fb(function(a){return U.test(a||"")||db.error("unsupported lang: "+a),a=a.replace(ab,bb).toLowerCase(),function(b){var c;do if(c=n?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===m},focus:function(a){return a===l.activeElement&&(!l.hasFocus||l.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:lb(function(){return[0]}),last:lb(function(a,b){return[b-1]}),eq:lb(function(a,b,c){return[0>c?c+b:c]}),even:lb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:lb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:lb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:lb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=jb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=kb(b);function nb(){}nb.prototype=d.filters=d.pseudos,d.setFilters=new nb;function ob(a,b){var c,e,f,g,h,i,j,k=x[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=Q.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?db.error(a):x(a,i).slice(0)}function pb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function qb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=v++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[u,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[s]||(b[s]={}),(h=i[d])&&h[0]===u&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function rb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function sb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function tb(a,b,c,d,e,f){return d&&!d[s]&&(d=tb(d)),e&&!e[s]&&(e=tb(e,f)),fb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||wb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:sb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=sb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=sb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ub(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],i=g||d.relative[" "],j=g?1:0,k=qb(function(a){return a===b},i,!0),l=qb(function(a){return I.call(b,a)>-1},i,!0),m=[function(a,c,d){return!g&&(d||c!==h)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>j;j++)if(c=d.relative[a[j].type])m=[qb(rb(m),c)];else{if(c=d.filter[a[j].type].apply(null,a[j].matches),c[s]){for(e=++j;f>e;e++)if(d.relative[a[e].type])break;return tb(j>1&&rb(m),j>1&&pb(a.slice(0,j-1).concat({value:" "===a[j-2].type?"*":""})).replace(P,"$1"),c,e>j&&ub(a.slice(j,e)),f>e&&ub(a=a.slice(e)),f>e&&pb(a))}m.push(c)}return rb(m)}function vb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,i,j,k){var m,n,o,p=0,q="0",r=f&&[],s=[],t=h,v=f||e&&d.find.TAG("*",k),w=u+=null==t?1:Math.random()||.1,x=v.length;for(k&&(h=g!==l&&g);q!==x&&null!=(m=v[q]);q++){if(e&&m){n=0;while(o=a[n++])if(o(m,g,i)){j.push(m);break}k&&(u=w)}c&&((m=!o&&m)&&p--,f&&r.push(m))}if(p+=q,c&&q!==p){n=0;while(o=b[n++])o(r,s,g,i);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=E.call(j));s=sb(s)}G.apply(j,s),k&&!f&&s.length>0&&p+b.length>1&&db.uniqueSort(j)}return k&&(u=w,h=t),r};return c?fb(f):f}g=db.compile=function(a,b){var c,d=[],e=[],f=y[a+" "];if(!f){b||(b=ob(a)),c=b.length;while(c--)f=ub(b[c]),f[s]?d.push(f):e.push(f);f=y(a,vb(e,d))}return f};function wb(a,b,c){for(var d=0,e=b.length;e>d;d++)db(a,b[d],c);return c}function xb(a,b,e,f){var h,i,j,k,l,m=ob(a);if(!f&&1===m.length){if(i=m[0]=m[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&c.getById&&9===b.nodeType&&n&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(ab,bb),b)||[])[0],!b)return e;a=a.slice(i.shift().value.length)}h=V.needsContext.test(a)?0:i.length;while(h--){if(j=i[h],d.relative[k=j.type])break;if((l=d.find[k])&&(f=l(j.matches[0].replace(ab,bb),$.test(i[0].type)&&mb(b.parentNode)||b))){if(i.splice(h,1),a=f.length&&pb(i),!a)return G.apply(e,f),e;break}}}return g(a,m)(f,b,!n,e,$.test(a)&&mb(b.parentNode)||b),e}return c.sortStable=s.split("").sort(z).join("")===s,c.detectDuplicates=!!j,k(),c.sortDetached=gb(function(a){return 1&a.compareDocumentPosition(l.createElement("div"))}),gb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||hb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&gb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||hb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),gb(function(a){return null==a.getAttribute("disabled")})||hb(J,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),db}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=a.document,A=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,B=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:A.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:z,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=z.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return y.find(a);this.length=1,this[0]=d}return this.context=z,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};B.prototype=n.fn,y=n(z);var C=/^(?:parents|prev(?:Until|All))/,D={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!n(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function E(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return E(a,"nextSibling")},prev:function(a){return E(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(D[a]||(e=n.unique(e)),C.test(a)&&(e=e.reverse())),this.pushStack(e)}});var F=/\S+/g,G={};function H(a){var b=G[a]={};return n.each(a.match(F)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?G[a]||H(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&n.each(arguments,function(a,c){var d;while((d=n.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){if(a===!0?!--n.readyWait:!n.isReady){if(!z.body)return setTimeout(n.ready);n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(z,[n]),n.fn.trigger&&n(z).trigger("ready").off("ready"))}}});function J(){z.addEventListener?(z.removeEventListener("DOMContentLoaded",K,!1),a.removeEventListener("load",K,!1)):(z.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(z.addEventListener||"load"===event.type||"complete"===z.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===z.readyState)setTimeout(n.ready);else if(z.addEventListener)z.addEventListener("DOMContentLoaded",K,!1),a.addEventListener("load",K,!1);else{z.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&z.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!n.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}J(),n.ready()}}()}return I.promise(b)};var L="undefined",M;for(M in n(l))break;l.ownLast="0"!==M,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c=z.getElementsByTagName("body")[0];c&&(a=z.createElement("div"),a.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",b=z.createElement("div"),c.appendChild(a).appendChild(b),typeof b.style.zoom!==L&&(b.style.cssText="border:0;margin:0;width:1px;padding:1px;display:inline;zoom:1",(l.inlineBlockNeedsLayout=3===b.offsetWidth)&&(c.style.zoom=1)),c.removeChild(a),a=b=null)}),function(){var a=z.createElement("div");if(null==l.deleteExpando){l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}}a=null}(),n.acceptData=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(n.acceptData(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f
|
3 |
+
}}function S(a,b,c){if(n.acceptData(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d]));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=n._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var T=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},W=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},X=/^(?:checkbox|radio)$/i;!function(){var a=z.createDocumentFragment(),b=z.createElement("div"),c=z.createElement("input");if(b.setAttribute("className","t"),b.innerHTML=" <link/><table></table><a href='/a'>a</a>",l.leadingWhitespace=3===b.firstChild.nodeType,l.tbody=!b.getElementsByTagName("tbody").length,l.htmlSerialize=!!b.getElementsByTagName("link").length,l.html5Clone="<:nav></:nav>"!==z.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,a.appendChild(c),l.appendChecked=c.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,a.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){l.noCloneEvent=!1}),b.cloneNode(!0).click()),null==l.deleteExpando){l.deleteExpando=!0;try{delete b.test}catch(d){l.deleteExpando=!1}}a=b=c=null}(),function(){var b,c,d=z.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),l[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var Y=/^(?:input|select|textarea)$/i,Z=/^key/,$=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,ab=/^([^.]*)(?:\.(.+)|)$/;function bb(){return!0}function cb(){return!1}function db(){try{return z.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof n===L||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(F)||[""],h=b.length;while(h--)f=ab.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(F)||[""],j=b.length;while(j--)if(h=ab.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,m,o=[d||z],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||z,3!==d.nodeType&&8!==d.nodeType&&!_.test(p+n.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[n.expando]?b:new n.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),k=n.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!n.isWindow(d)){for(i=k.delegateType||p,_.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||z)&&o.push(l.defaultView||l.parentWindow||a)}m=0;while((h=o[m++])&&!b.isPropagationStopped())b.type=m>1?i:k.bindType||p,f=(n._data(h,"events")||{})[b.type]&&n._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&n.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&n.acceptData(d)&&g&&d[p]&&!n.isWindow(d)){l=d[g],l&&(d[g]=null),n.event.triggered=p;try{d[p]()}catch(r){}n.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((n.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?n(c,this).index(i)>=0:n.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=$.test(e)?this.mouseHooks:Z.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||z),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||z,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==db()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===db()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return n.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=z.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===L&&(a[d]=null),a.detachEvent(d,c))},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&(a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault())?bb:cb):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:cb,isPropagationStopped:cb,isImmediatePropagationStopped:cb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=bb,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=bb,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.submitBubbles||(n.event.special.submit={setup:function(){return n.nodeName(this,"form")?!1:void n.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=n.nodeName(b,"input")||n.nodeName(b,"button")?b.form:void 0;c&&!n._data(c,"submitBubbles")&&(n.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),n._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&n.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return n.nodeName(this,"form")?!1:void n.event.remove(this,"._submit")}}),l.changeBubbles||(n.event.special.change={setup:function(){return Y.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(n.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),n.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),n.event.simulate("change",this,a,!0)})),!1):void n.event.add(this,"beforeactivate._change",function(a){var b=a.target;Y.test(b.nodeName)&&!n._data(b,"changeBubbles")&&(n.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||n.event.simulate("change",this.parentNode,a,!0)}),n._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return n.event.remove(this,"._change"),!Y.test(this.nodeName)}}),l.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=n._data(d,b);e||d.addEventListener(a,c,!0),n._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=n._data(d,b)-1;e?n._data(d,b,e):(d.removeEventListener(a,c,!0),n._removeData(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=cb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return n().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=cb),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});function eb(a){var b=fb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var fb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gb=/ jQuery\d+="(?:null|\d+)"/g,hb=new RegExp("<(?:"+fb+")[\\s/>]","i"),ib=/^\s+/,jb=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,kb=/<([\w:]+)/,lb=/<tbody/i,mb=/<|&#?\w+;/,nb=/<(?:script|style|link)/i,ob=/checked\s*(?:[^=]|=\s*.checked.)/i,pb=/^$|\/(?:java|ecma)script/i,qb=/^true\/(.*)/,rb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,sb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:l.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},tb=eb(z),ub=tb.appendChild(z.createElement("div"));sb.optgroup=sb.option,sb.tbody=sb.tfoot=sb.colgroup=sb.caption=sb.thead,sb.th=sb.td;function vb(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==L?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==L?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,vb(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function wb(a){X.test(a.type)&&(a.defaultChecked=a.checked)}function xb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function yb(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function zb(a){var b=qb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ab(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}function Bb(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Cb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(yb(b).text=a.text,zb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&X.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}n.extend({clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!hb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ub.innerHTML=a.outerHTML,ub.removeChild(f=ub.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=vb(f),h=vb(a),g=0;null!=(e=h[g]);++g)d[g]&&Cb(e,d[g]);if(b)if(c)for(h=h||vb(a),d=d||vb(f),g=0;null!=(e=h[g]);g++)Bb(e,d[g]);else Bb(a,f);return d=vb(f,"script"),d.length>0&&Ab(d,!i&&vb(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k,m=a.length,o=eb(b),p=[],q=0;m>q;q++)if(f=a[q],f||0===f)if("object"===n.type(f))n.merge(p,f.nodeType?[f]:f);else if(mb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(kb.exec(f)||["",""])[1].toLowerCase(),k=sb[i]||sb._default,h.innerHTML=k[1]+f.replace(jb,"<$1></$2>")+k[2],e=k[0];while(e--)h=h.lastChild;if(!l.leadingWhitespace&&ib.test(f)&&p.push(b.createTextNode(ib.exec(f)[0])),!l.tbody){f="table"!==i||lb.test(f)?"<table>"!==k[1]||lb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)n.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}n.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),l.appendChecked||n.grep(vb(p,"input"),wb),q=0;while(f=p[q++])if((!d||-1===n.inArray(f,d))&&(g=n.contains(f.ownerDocument,f),h=vb(o.appendChild(f),"script"),g&&Ab(h),c)){e=0;while(f=h[e++])pb.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.deleteExpando,m=n.event.special;null!=(d=a[h]);h++)if((b||n.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k?delete d[i]:typeof d.removeAttribute!==L?d.removeAttribute(i):d[i]=null,c.push(f))}}}),n.fn.extend({text:function(a){return W(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||z).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(vb(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&Ab(vb(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(vb(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return W(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(gb,""):void 0;if(!("string"!=typeof a||nb.test(a)||!l.htmlSerialize&&hb.test(a)||!l.leadingWhitespace&&ib.test(a)||sb[(kb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(jb,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(vb(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(vb(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,k=this.length,m=this,o=k-1,p=a[0],q=n.isFunction(p);if(q||k>1&&"string"==typeof p&&!l.checkClone&&ob.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(k&&(i=n.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=n.map(vb(i,"script"),yb),f=g.length;k>j;j++)d=i,j!==o&&(d=n.clone(d,!0,!0),f&&n.merge(g,vb(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,n.map(g,zb),j=0;f>j;j++)d=g[j],pb.test(d.type||"")&&!n._data(d,"globalEval")&&n.contains(h,d)&&(d.src?n._evalUrl&&n._evalUrl(d.src):n.globalEval((d.text||d.textContent||d.innerHTML||"").replace(rb,"")));i=c=null}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],g=n(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Db,Eb={};function Fb(b,c){var d=n(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:n.css(d[0],"display");return d.detach(),e}function Gb(a){var b=z,c=Eb[a];return c||(c=Fb(a,b),"none"!==c&&c||(Db=(Db||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Db[0].contentWindow||Db[0].contentDocument).document,b.write(),b.close(),c=Fb(a,b),Db.detach()),Eb[a]=c),c}!function(){var a,b,c=z.createElement("div"),d="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";c.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=c.getElementsByTagName("a")[0],a.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(a.style.opacity),l.cssFloat=!!a.style.cssFloat,c.style.backgroundClip="content-box",c.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===c.style.backgroundClip,a=c=null,l.shrinkWrapBlocks=function(){var a,c,e,f;if(null==b){if(a=z.getElementsByTagName("body")[0],!a)return;f="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",c=z.createElement("div"),e=z.createElement("div"),a.appendChild(c).appendChild(e),b=!1,typeof e.style.zoom!==L&&(e.style.cssText=d+";width:1px;padding:1px;zoom:1",e.innerHTML="<div></div>",e.firstChild.style.width="5px",b=3!==e.offsetWidth),a.removeChild(c),a=c=e=null}return b}}();var Hb=/^margin/,Ib=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Jb,Kb,Lb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Jb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),Ib.test(g)&&Hb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):z.documentElement.currentStyle&&(Jb=function(a){return a.currentStyle},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ib.test(g)&&!Lb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Mb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h=z.createElement("div"),i="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",j="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";h.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",b=h.getElementsByTagName("a")[0],b.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(b.style.opacity),l.cssFloat=!!b.style.cssFloat,h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,b=h=null,n.extend(l,{reliableHiddenOffsets:function(){if(null!=c)return c;var a,b,d,e=z.createElement("div"),f=z.getElementsByTagName("body")[0];if(f)return e.setAttribute("className","t"),e.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=z.createElement("div"),a.style.cssText=i,f.appendChild(a).appendChild(e),e.innerHTML="<table><tr><td></td><td>t</td></tr></table>",b=e.getElementsByTagName("td"),b[0].style.cssText="padding:0;margin:0;border:0;display:none",d=0===b[0].offsetHeight,b[0].style.display="",b[1].style.display="none",c=d&&0===b[0].offsetHeight,f.removeChild(a),e=f=null,c},boxSizing:function(){return null==d&&k(),d},boxSizingReliable:function(){return null==e&&k(),e},pixelPosition:function(){return null==f&&k(),f},reliableMarginRight:function(){var b,c,d,e;if(null==g&&a.getComputedStyle){if(b=z.getElementsByTagName("body")[0],!b)return;c=z.createElement("div"),d=z.createElement("div"),c.style.cssText=i,b.appendChild(c).appendChild(d),e=d.appendChild(z.createElement("div")),e.style.cssText=d.style.cssText=j,e.style.marginRight=e.style.width="0",d.style.width="1px",g=!parseFloat((a.getComputedStyle(e,null)||{}).marginRight),b.removeChild(c)}return g}});function k(){var b,c,h=z.getElementsByTagName("body")[0];h&&(b=z.createElement("div"),c=z.createElement("div"),b.style.cssText=i,h.appendChild(b).appendChild(c),c.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:absolute;display:block;padding:1px;border:1px;width:4px;margin-top:1%;top:1%",n.swap(h,null!=h.style.zoom?{zoom:1}:{},function(){d=4===c.offsetWidth}),e=!0,f=!1,g=!0,a.getComputedStyle&&(f="1%"!==(a.getComputedStyle(c,null)||{}).top,e="4px"===(a.getComputedStyle(c,null)||{width:"4px"}).width),h.removeChild(b),c=h=null)}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Nb=/alpha\([^)]*\)/i,Ob=/opacity\s*=\s*([^)]*)/,Pb=/^(none|table(?!-c[ea]).+)/,Qb=new RegExp("^("+T+")(.*)$","i"),Rb=new RegExp("^([+-])=("+T+")","i"),Sb={position:"absolute",visibility:"hidden",display:"block"},Tb={letterSpacing:0,fontWeight:400},Ub=["Webkit","O","Moz","ms"];function Vb(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ub.length;while(e--)if(b=Ub[e]+c,b in a)return b;return d}function Wb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=n._data(d,"olddisplay",Gb(d.nodeName)))):f[g]||(e=V(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Xb(a,b,c){var d=Qb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Yb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Zb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Jb(a),g=l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Kb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ib.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Yb(a,b,c||(g?"border":"content"),d,f)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Kb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=Vb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Rb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]="",i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Vb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Kb(a,b,d)),"normal"===f&&b in Tb&&(f=Tb[b]),""===c||c?(e=parseFloat(f),c===!0||n.isNumeric(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?0===a.offsetWidth&&Pb.test(n.css(a,"display"))?n.swap(a,Sb,function(){return Zb(a,b,d)}):Zb(a,b,d):void 0},set:function(a,c,d){var e=d&&Jb(a);return Xb(a,c,d?Yb(a,b,d,l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Ob.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Nb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Nb.test(f)?f.replace(Nb,e):f+" "+e)}}),n.cssHooks.marginRight=Mb(l.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},Kb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Hb.test(a)||(n.cssHooks[a+b].set=Xb)}),n.fn.extend({css:function(a,b){return W(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Jb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)
|
4 |
+
},a,b,arguments.length>1)},show:function(){return Wb(this,!0)},hide:function(){return Wb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function $b(a,b,c,d,e){return new $b.prototype.init(a,b,c,d,e)}n.Tween=$b,$b.prototype={constructor:$b,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=$b.propHooks[this.prop];return a&&a.get?a.get(this):$b.propHooks._default.get(this)},run:function(a){var b,c=$b.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):$b.propHooks._default.set(this),this}},$b.prototype.init.prototype=$b.prototype,$b.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},$b.propHooks.scrollTop=$b.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=$b.prototype.init,n.fx.step={};var _b,ac,bc=/^(?:toggle|show|hide)$/,cc=new RegExp("^(?:([+-])=|)("+T+")([a-z%]*)$","i"),dc=/queueHooks$/,ec=[jc],fc={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=cc.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&cc.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function gc(){return setTimeout(function(){_b=void 0}),_b=n.now()}function hc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=U[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function ic(a,b,c){for(var d,e=(fc[b]||[]).concat(fc["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function jc(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&V(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k=Gb(a.nodeName),"none"===j&&(j=k),"inline"===j&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==k?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],bc.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}if(!n.isEmptyObject(o)){r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=ic(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function kc(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function lc(a,b,c){var d,e,f=0,g=ec.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=_b||gc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:_b||gc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(kc(k,j.opts.specialEasing);g>f;f++)if(d=ec[f].call(j,a,k,j.opts))return d;return n.map(k,ic,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(lc,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],fc[c]=fc[c]||[],fc[c].unshift(b)},prefilter:function(a,b){b?ec.unshift(a):ec.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(V).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=lc(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&dc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(hc(b,!0),a,d,e)}}),n.each({slideDown:hc("show"),slideUp:hc("hide"),slideToggle:hc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(_b=n.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||n.fx.stop(),_b=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){ac||(ac=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(ac),ac=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e=z.createElement("div");e.setAttribute("className","t"),e.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=e.getElementsByTagName("a")[0],c=z.createElement("select"),d=c.appendChild(z.createElement("option")),b=e.getElementsByTagName("input")[0],a.style.cssText="top:1px",l.getSetAttribute="t"!==e.className,l.style=/top/.test(a.getAttribute("style")),l.hrefNormalized="/a"===a.getAttribute("href"),l.checkOn=!!b.value,l.optSelected=d.selected,l.enctype=!!z.createElement("form").enctype,c.disabled=!0,l.optDisabled=!d.disabled,b=z.createElement("input"),b.setAttribute("value",""),l.input=""===b.getAttribute("value"),b.value="t",b.setAttribute("type","radio"),l.radioValue="t"===b.value,a=b=c=d=e=null}();var mc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(mc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.text(a)}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(l.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)if(d=e[g],n.inArray(n.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var nc,oc,pc=n.expr.attrHandle,qc=/^(?:checked|selected)$/i,rc=l.getSetAttribute,sc=l.input;n.fn.extend({attr:function(a,b){return W(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===L?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?oc:nc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(F);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)?sc&&rc||!qc.test(c)?a[d]=!1:a[n.camelCase("default-"+c)]=a[d]=!1:n.attr(a,c,""),a.removeAttribute(rc?c:d)},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),oc={set:function(a,b,c){return b===!1?n.removeAttr(a,c):sc&&rc||!qc.test(c)?a.setAttribute(!rc&&n.propFix[c]||c,c):a[n.camelCase("default-"+c)]=a[c]=!0,c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=pc[b]||n.find.attr;pc[b]=sc&&rc||!qc.test(b)?function(a,b,d){var e,f;return d||(f=pc[b],pc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,pc[b]=f),e}:function(a,b,c){return c?void 0:a[n.camelCase("default-"+b)]?b.toLowerCase():null}}),sc&&rc||(n.attrHooks.value={set:function(a,b,c){return n.nodeName(a,"input")?void(a.defaultValue=b):nc&&nc.set(a,b,c)}}),rc||(nc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},pc.id=pc.name=pc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},n.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:nc.set},n.attrHooks.contenteditable={set:function(a,b,c){nc.set(a,""===b?!1:b,c)}},n.each(["width","height"],function(a,b){n.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),l.style||(n.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var tc=/^(?:input|select|textarea|button|object)$/i,uc=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return W(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return a=n.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):tc.test(a.nodeName)||uc.test(a.nodeName)&&a.href?0:-1}}}}),l.hrefNormalized||n.each(["href","src"],function(a,b){n.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this}),l.enctype||(n.propFix.enctype="encoding");var vc=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(F)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===L||"boolean"===c)&&(this.className&&n._data(this,"__className__",this.className),this.className=this.className||a===!1?"":n._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(vc," ").indexOf(b)>=0)return!0;return!1}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var wc=n.now(),xc=/\?/,yc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;n.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=n.trim(b+"");return e&&!n.trim(e.replace(yc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():n.error("Invalid JSON: "+b)},n.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var zc,Ac,Bc=/#.*$/,Cc=/([?&])_=[^&]*/,Dc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Ec=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Fc=/^(?:GET|HEAD)$/,Gc=/^\/\//,Hc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Ic={},Jc={},Kc="*/".concat("*");try{Ac=location.href}catch(Lc){Ac=z.createElement("a"),Ac.href="",Ac=Ac.href}zc=Hc.exec(Ac.toLowerCase())||[];function Mc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(F)||[];if(n.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nc(a,b,c,d){var e={},f=a===Jc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Oc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&n.extend(!0,a,c),a}function Pc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Qc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ac,type:"GET",isLocal:Ec.test(zc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Oc(Oc(a,n.ajaxSettings),b):Oc(n.ajaxSettings,a)},ajaxPrefilter:Mc(Ic),ajaxTransport:Mc(Jc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Dc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||Ac)+"").replace(Bc,"").replace(Gc,zc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(F)||[""],null==k.crossDomain&&(c=Hc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===zc[1]&&c[2]===zc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(zc[3]||("http:"===zc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),Nc(Ic,k,b,v),2===t)return v;h=k.global,h&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Fc.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(xc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Cc.test(e)?e.replace(Cc,"$1_="+wc++):e+(xc.test(e)?"&":"?")+"_="+wc++)),k.ifModified&&(n.lastModified[e]&&v.setRequestHeader("If-Modified-Since",n.lastModified[e]),n.etag[e]&&v.setRequestHeader("If-None-Match",n.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Kc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Nc(Jc,k,b,v)){v.readyState=1,h&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Pc(k,v,c)),u=Qc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(n.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){if(n.isFunction(a))return this.each(function(b){n(this).wrapAll(a.call(this,b))});if(this[0]){var b=n(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!l.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||n.css(a,"display"))},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var Rc=/%20/g,Sc=/\[\]$/,Tc=/\r?\n/g,Uc=/^(?:submit|button|image|reset|file)$/i,Vc=/^(?:input|select|textarea|keygen)/i;function Wc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Sc.test(a)?d(a,e):Wc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Wc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Wc(c,a[c],b,e);return d.join("&").replace(Rc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Vc.test(this.nodeName)&&!Uc.test(a)&&(this.checked||!X.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(Tc,"\r\n")}}):{name:b.name,value:c.replace(Tc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&$c()||_c()}:$c;var Xc=0,Yc={},Zc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Yc)Yc[a](void 0,!0)}),l.cors=!!Zc&&"withCredentials"in Zc,Zc=l.ajax=!!Zc,Zc&&n.ajaxTransport(function(a){if(!a.crossDomain||l.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Xc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Yc[g],b=void 0,f.onreadystatechange=n.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Yc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function $c(){try{return new a.XMLHttpRequest}catch(b){}}function _c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=z.head||n("head")[0]||z.documentElement;return{send:function(d,e){b=z.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var ad=[],bd=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=ad.pop()||n.expando+"_"+wc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(bd.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&bd.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(bd,"$1"+e):b.jsonp!==!1&&(b.url+=(xc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,ad.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||z;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var cd=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&cd)return cd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=a.slice(h,a.length),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&n.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var dd=a.document.documentElement;function ed(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?(typeof e.getBoundingClientRect!==L&&(d=e.getBoundingClientRect()),c=ed(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||dd;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||dd})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return W(this,function(a,d,e){var f=ed(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Mb(l.pixelPosition,function(a,c){return c?(c=Kb(a,b),Ib.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return W(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var fd=a.jQuery,gd=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=gd),b&&a.jQuery===n&&(a.jQuery=fd),n},typeof b===L&&(a.jQuery=a.$=n),n});
|
js/iparcel/lib.js
ADDED
@@ -0,0 +1,46 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
var iparcelMage = {
|
2 |
+
displayEligibility: function(){
|
3 |
+
try{
|
4 |
+
$_ipar.fn.iparcel.ux.displayEligibility();
|
5 |
+
}catch(exception){}
|
6 |
+
},
|
7 |
+
ajax: {
|
8 |
+
post: function(sku, super_attribute, url) {
|
9 |
+
var $jip = jQuery.noConflict();
|
10 |
+
var data = super_attribute+'sku='+sku;
|
11 |
+
$jip('.iparcelsku').attr('finalsku', 'false');
|
12 |
+
$jip.ajax({
|
13 |
+
'url': url,
|
14 |
+
'data': data,
|
15 |
+
type: 'POST',
|
16 |
+
async: true,
|
17 |
+
success: function(data){
|
18 |
+
if (data){
|
19 |
+
$jip('.iparcelsku').text(data.sku);
|
20 |
+
$jip('.iparcelsku').attr('finalsku', 'true');
|
21 |
+
|
22 |
+
iparcelPost.setStock('true');
|
23 |
+
|
24 |
+
var $options = $jip('.iparceloptions');
|
25 |
+
$options.empty();
|
26 |
+
$jip.each(data.attributes, function(key, value){
|
27 |
+
var $block = $jip('<div/>');
|
28 |
+
$block.attr('id',key);
|
29 |
+
$block.text(value);
|
30 |
+
$options.append($block);
|
31 |
+
});
|
32 |
+
|
33 |
+
$jip('.iparcelstockquantity').text(data.stock);
|
34 |
+
}
|
35 |
+
iparcelMage.displayEligibility();
|
36 |
+
}
|
37 |
+
});
|
38 |
+
}
|
39 |
+
},
|
40 |
+
parseHtmlEntities: function(str){
|
41 |
+
return str.replace(/&#([0-9]{1,4});/gi,function(match,numStr){
|
42 |
+
var num = parseInt(numStr,10);
|
43 |
+
return String.fromCharCode(num);
|
44 |
+
});
|
45 |
+
}
|
46 |
+
}
|
js/iparcel/post.js
ADDED
@@ -0,0 +1,172 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
var $jip = jQuery.noConflict();
|
2 |
+
var iparcelPost = {
|
3 |
+
sku: null,
|
4 |
+
url: null,
|
5 |
+
sku_list_cache: null,
|
6 |
+
stock_list_cache: null,
|
7 |
+
textSelectors: '.product-custom-option[type="text"], textarea.product-custom-option',
|
8 |
+
clear: function () {
|
9 |
+
$jip('.iparcelsku,.iparcelstock').remove();
|
10 |
+
},
|
11 |
+
single: function(sku, url){
|
12 |
+
this.sku = sku;
|
13 |
+
if (url.indexOf(':') == 0) {
|
14 |
+
url = url.substring(1,url.length);
|
15 |
+
}
|
16 |
+
this.url = url+'iparcel/ajax/configurable';
|
17 |
+
$jip(document).ready(function(){
|
18 |
+
var $sku = $jip("<div/>");
|
19 |
+
$sku.css("display","none");
|
20 |
+
$sku.attr("class","iparcelsku");
|
21 |
+
$sku.text(sku);
|
22 |
+
$jip('form#product_addtocart_form').append($sku);
|
23 |
+
|
24 |
+
var $options = $jip("<div/>");
|
25 |
+
$options.css("display","none");
|
26 |
+
$options.attr("class","iparceloptions");
|
27 |
+
$jip('form#product_addtocart_form').append($options);
|
28 |
+
|
29 |
+
$jip('.super-attribute-select').change(function(){
|
30 |
+
iparcelPost.updateSelect();
|
31 |
+
});
|
32 |
+
|
33 |
+
// if there are '.super-attribute-select' elements, find the SKU
|
34 |
+
// for the default configuration
|
35 |
+
if ($jip('.super-attribute-select.required-entry').length > 0) {
|
36 |
+
$jip('.super-attribute-select.required-entry').each(function() {
|
37 |
+
this.validOptions = [];
|
38 |
+
|
39 |
+
var self = this;
|
40 |
+
$jip(this).children().each(function(){
|
41 |
+
if ($jip(this).val() != '') {
|
42 |
+
self.validOptions.push($jip(this).val());
|
43 |
+
}
|
44 |
+
});
|
45 |
+
|
46 |
+
if (this.validOptions.length == 1) {
|
47 |
+
// Only one valid option for this required select
|
48 |
+
$jip(this).val(this.validOptions[0]);
|
49 |
+
}
|
50 |
+
});
|
51 |
+
iparcelPost.updateSelect();
|
52 |
+
}
|
53 |
+
// Watch for custom option text fields, areas
|
54 |
+
$jip(iparcelPost.textSelectors).change(function() {
|
55 |
+
iparcelPost.updateTextfields();
|
56 |
+
});
|
57 |
+
|
58 |
+
var $iterator = 0;
|
59 |
+
$jip(document).bind('DOMNodeInserted', function(e){
|
60 |
+
if ($jip(e.target).attr('class') == 'swatch-link'){
|
61 |
+
$jip(e.target).click(iparcelPost.update);
|
62 |
+
if ($iterator++ == 0){
|
63 |
+
var target = e.target;
|
64 |
+
setTimeout(function(){
|
65 |
+
if($iterator == 1){
|
66 |
+
$jip(target).click();
|
67 |
+
}
|
68 |
+
},500);
|
69 |
+
}
|
70 |
+
}
|
71 |
+
});
|
72 |
+
|
73 |
+
$jip('.swatch-link').click(iparcelPost.update);
|
74 |
+
});
|
75 |
+
},
|
76 |
+
update: function(){
|
77 |
+
var $this = $jip(this);
|
78 |
+
var id = $this.parent().attr('id').split('option')[1];
|
79 |
+
var val = $this.attr('id').split('swatch')[1];
|
80 |
+
var super_attribute = '';
|
81 |
+
$jip('.super-attribute-select').each(function(){
|
82 |
+
var $this = $jip(this);
|
83 |
+
if ($this.attr('name') != 'super_attribute['+id+']'){
|
84 |
+
super_attribute+=$this.attr('name')+'='+$this.val()+'&';
|
85 |
+
}
|
86 |
+
});
|
87 |
+
iparcelMage.ajax.post(iparcelPost.sku,super_attribute,iparcelPost.url);
|
88 |
+
},
|
89 |
+
updateSelect: function () {
|
90 |
+
iparcelPost.setStock('false');
|
91 |
+
var $this = $jip(this);
|
92 |
+
var super_attribute = '';
|
93 |
+
$jip('.super-attribute-select, .product-custom-option').each(function () {
|
94 |
+
var $this = $jip(this);
|
95 |
+
super_attribute += $this.attr('name') + '=' + $this.val() + '&';
|
96 |
+
});
|
97 |
+
iparcelMage.ajax.post(iparcelPost.sku, super_attribute, iparcelPost.url);
|
98 |
+
},
|
99 |
+
updateTextfields: function() {
|
100 |
+
iparcelPost.setStock('false');
|
101 |
+
var custom_options = '';
|
102 |
+
$jip(iparcelPost.textSelectors).each(function() {
|
103 |
+
var $this = $jip(this);
|
104 |
+
custom_options += $this.attr('name') + '=' + $this.val() + '&';
|
105 |
+
});
|
106 |
+
iparcelMage.ajax.post(iparcelPost.sku, custom_options, iparcelPost.url);
|
107 |
+
},
|
108 |
+
stock: function(qty){
|
109 |
+
$jip(document).ready(function(){
|
110 |
+
var $stock = $jip("<div/>");
|
111 |
+
$stock.css("display","none");
|
112 |
+
$stock.attr("class","iparcelstock");
|
113 |
+
$stock.text(qty > 0 ? 'true' : 'false');
|
114 |
+
$jip('form#product_addtocart_form').append($stock);
|
115 |
+
});
|
116 |
+
},
|
117 |
+
setStock: function(value){
|
118 |
+
$jip('.iparcelstock').text(value);
|
119 |
+
},
|
120 |
+
sku_list: function (sku_list) {
|
121 |
+
this.sku_list_cache = sku_list;
|
122 |
+
$jip(document).ready(function(){
|
123 |
+
$jip.each(sku_list, function(sku,name){
|
124 |
+
name = iparcelMage.parseHtmlEntities(name);
|
125 |
+
var $sku = $jip("<div/>");
|
126 |
+
$sku.css("display","none");
|
127 |
+
$sku.attr("class","iparcelsku");
|
128 |
+
$sku.text(sku);
|
129 |
+
iparcelPost.append($sku,name);
|
130 |
+
});
|
131 |
+
});
|
132 |
+
$jip(document).ajaxSuccess(function(data){
|
133 |
+
iparcelPost.sku_list(sku_list);
|
134 |
+
});
|
135 |
+
},
|
136 |
+
stock_list: function(stock_list){
|
137 |
+
this.stock_list_cache = stock_list;
|
138 |
+
$jip(document).ready(function(){
|
139 |
+
$jip.each(stock_list, function(name,qty){
|
140 |
+
name = iparcelMage.parseHtmlEntities(name);
|
141 |
+
var $stock = $jip("<div/>");
|
142 |
+
$stock.css("display","none");
|
143 |
+
$stock.attr("class","iparcelstock");
|
144 |
+
$stock.text(qty > 0 ? 'true' : 'false');
|
145 |
+
iparcelPost.append($stock,name);
|
146 |
+
});
|
147 |
+
});
|
148 |
+
},
|
149 |
+
append: function(item,name){
|
150 |
+
var $item = $jip('.item .product-name a').filter(function () {
|
151 |
+
return $jip(this).text() == name;
|
152 |
+
});
|
153 |
+
$item.closest('.item').append(item);
|
154 |
+
}
|
155 |
+
};
|
156 |
+
|
157 |
+
Ajax.Responders.register({
|
158 |
+
onComplete: function(args){
|
159 |
+
iparcelPost.sku_list(iparcelPost.sku_list_cache);
|
160 |
+
iparcelPost.stock_list(iparcelPost.stock_list_cache);
|
161 |
+
if( typeof iparcel.session !== "undefined" ) {
|
162 |
+
if( typeof iparcel.session.content !== "undefined" ) {
|
163 |
+
if( typeof iparcel.session.content.locale !== "undefined" && iparcel.session.content.locale == "US" ) {
|
164 |
+
$_ipar(iparcel.settings.productListingPriceElement).css("visibility","visible");
|
165 |
+
}
|
166 |
+
else{
|
167 |
+
iparcel.ux.displayEligibility();
|
168 |
+
}
|
169 |
+
}
|
170 |
+
}
|
171 |
+
}
|
172 |
+
});
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>iparcel_logistics</name>
|
4 |
-
<version>1.
|
5 |
<stability>stable</stability>
|
6 |
<license>GPL</license>
|
7 |
<channel>community</channel>
|
@@ -16,9 +16,9 @@
|
|
16 |
<email>bburden@i-parcel.com</email>
|
17 |
</author>
|
18 |
</authors>
|
19 |
-
<date>2016-
|
20 |
-
<time>
|
21 |
-
<contents><target name="mageweb"><dir name="app"><dir name="etc"><dir name="modules"><file name="Iparcel_Logistics.xml" hash="2f375c30334e2d4a6bae03ccab808dd3"/><file name="Iparcel_All.xml" hash="89e4b47a6ac9aa0b82f70b1539d587ea"/></dir></dir><dir name="code"><dir name="community"><dir name="Iparcel"><dir name="Logistics"><dir name="Block"><dir name="Adminhtml"><dir name="Iplogistics"><dir name="Shipment"><dir name="Split"><file name="Form.php" hash="99e8ca49bb180c05bf05e44e41f880f7"/></dir><file name="Split.php" hash="848f88a16a03e5d58453e03e454a9a78"/></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Method.php" hash="09224de41e6bdb1fa951c631128fa2b9"/></dir></dir></dir></dir></dir><dir name="Sales"><dir name="Order"><dir name="Totals"><file name="Abstract.php" hash="e947a0fdfc0fdb3ce7fa7babb89937a2"/><file name="Duty.php" hash="afb0726fe989e1acc65aee33a7b627f6"/><file name="Tax.php" hash="6fe811b4600365d25bf9a51e4d953e0c"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Iplogistics"><dir name="Shipment"><file name="SplitController.php" hash="69ab4c55cc6436dc0fb2f6a722805c01"/></dir><file name="ShipmentController.php" hash="ebcac746bc97c046e71b0910e96174d9"/></dir></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="8b8a4a0643ce23b42709f3b82e46e830"/><file name="config.xml" hash="654668da85bb9da0a19b07f84625b210"/><file name="system.xml" hash="f76253c6d1ac4fe57bd8808e7e12b16b"/></dir><dir name="Helper"><file name="Api.php" hash="8b9342e61fdb35afecc61fc8bd5ea16f"/><file name="Data.php" hash="6c32f6385d25ca571e380d695082cc09"/></dir><dir name="Model"><dir name="Api"><file name="Quote.php" hash="dd94fe794f8bff3c122e721ae28e2f5b"/></dir><dir name="Carrier"><file name="Iparcel.php" hash="736c44e55ef201099c0a5102be650e7b"/></dir><file name="Observer.php" hash="755526adc3a787354f4a0a0f9d965f88"/><dir name="Order"><dir name="Creditmemo"><dir name="Total"><file name="Duty.php" hash="d0fcc186046a33801ac5e77dc25a3152"/><file name="Tax.php" hash="2df3ee20703bcd793a2f214b7c30a057"/></dir></dir><dir name="Invoice"><dir name="Total"><file name="Duty.php" hash="8dbca3de53bdf5159cc21a889c0b84bc"/><file name="Tax.php" hash="d1b26d33237835d922c343e94cbefdae"/></dir></dir></dir><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Abstract.php" hash="d1645562e36962bcf381f6b227eb9d2c"/><file name="Collector.php" hash="11eb9174e5feea80a4b3c693dbc4edee"/><file name="Duty.php" hash="1997a432a12e19fcb90cd87fb673f8b7"/><file name="Tax.php" hash="9d2c47a707084b9d71b139fd6a873939"/></dir></dir></dir><dir name="Resource"><dir name="Api"><file name="Quote.php" hash="d2120075a3a82084cbea35657e1f2dca"/></dir><dir name="Mysql4"><file name="Setup.php" hash="3eee28f86610e6cf1b83ee58b83d5e83"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><dir name="Tax"><file name="Mode.php" hash="e8e734bcc2128ef9cdbb8381d7969c68"/></dir></dir></dir></dir><dir name="Tax"><dir name="Quote"><file name="Shipping.php" hash="f5282471644f56ee0fff8c98bd95b9de"/><file name="Subtotal.php" hash="81b55a134b1cc6a45c920f40605a1fcb"/><file name="Tax.php" hash="ff7cd4a769646ed25aaab7c2cdc23775"/></dir></dir></dir><dir name="sql"><dir name="iplogistics_setup"><file name="mysql4-install-1.0.0.php" hash="69d5c2429cf5ee2d11e598f2137e7dc8"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="5f5645be5c8cd64394d8692e7fa847f9"/><file name="mysql4-upgrade-1.0.1-1.0.2.php" hash="a298c97b931d6dcf9cb6a70eb716b354"/><file name="mysql4-upgrade-1.0.3-1.0.4.php" hash="9c0ccf88b7be483f52beb6a72156da63"/><file name="mysql4-upgrade-1.0.5-1.0.6.php" hash="97e22b1de739c3ee752c154b155f7987"/></dir></dir></dir><dir name="All"><dir name="Block"><dir name="Adminhtml"><dir name="Catalog"><dir name="Mapping"><file name="Button.php" hash="dfdaf5a2fbf824a10fccc952fdccf567"/></dir></dir><dir name="Iparcel"><file name="Dashboard.php" hash="ec9dddd10368136f1bdfe79fddd4500c"/><file name="Logs.php" hash="be8765472a9d2adc54473fe1df677921"/><dir name="Logs"><file name="Grid.php" hash="d78e239ba695619627c114cb52d38646"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Iparcel"><file name="LogController.php" hash="b30163b1c1b06b76c778b815cb0485d9"/><file name="SyncController.php" hash="9378f5db27d059bbb36ff1e71bd38d32"/><dir name="Sync"><file name="AjaxController.php" hash="671afecdeaed8f4c80a85d78605cd6da"/></dir></dir></dir><file name="InfoController.php" hash="6543b1e9803489e507d2470f8e3e408b"/></dir><dir name="etc"><file name="adminhtml.xml" hash="50bc0bee93b5612763321eae11cfdc51"/><file name="config.xml" hash="713a6455fd9ba664fa6fbe4de0f28e76"/><file name="system.xml" hash="809d4deab49bffad6a6820c05bad49f6"/></dir><dir name="Helper"><file name="Api.php" hash="aa9c589ecf90b26c4ed2684ac8fd68a1"/><file name="Data.php" hash="4cfb227c77a5597bb21ba1ab1cbc65bd"/></dir><dir name="Model"><dir name="Catalog"><dir name="Product"><file name="Observer.php" hash="d16d89cea8eea6352a7d9b1193cd9512"/></dir></dir><file name="Cron.php" hash="670d37cd6cdbe60aa69fad8eb0a0759e"/><file name="Log.php" hash="0209908a304c4940fe20b961b3d82c6c"/><dir name="System"><dir name="Config"><dir name="Catalog"><file name="Mapping.php" hash="8895678aa59e49226509d2b4709c5f43"/></dir><dir name="Data"><dir name="Date"><file name="Monthday.php" hash="baec5b8a27c5b037529ba935aae0370a"/><file name="Weekday.php" hash="173edc075325d932f8dad6d4674b8153"/></dir><dir name="Time"><file name="Hour.php" hash="ddad98b85290d9b13ec9f65fbe8a10b3"/><file name="Minute.php" hash="4a76af0057d60e8ff0ff7fedc1d50575"/></dir></dir><file name="Guid.php" hash="311c7f8072f02a6be9e25b6411298c5c"/><dir name="Script"><file name="Js.php" hash="3e3f23b38ecdc361bf6ff6cee1871e92"/></dir><dir name="Source"><dir name="Catalog"><dir name="Mapping"><dir name="Configurable"><file name="Price.php" hash="f9116fd446914467e7fb31bed5a6dd0b"/></dir><file name="Mode.php" hash="36140a050ea65ff23d45264fa67e1a2b"/></dir><dir name="Product"><dir name="Attribute"><file name="Boolean.php" hash="ca1883122659f1b48890ecd46a1590ee"/></dir><file name="Attribute.php" hash="8ca9c929cda497400865751ffba991e6"/></dir></dir><dir name="Date"><file name="Weekday.php" hash="143c26f9661e5dc995ff064e333a2018"/></dir><dir name="Sales"><dir name="Order"><file name="Status.php" hash="f1e414c08c43ebb2fcc6ccf5b41a2ff2"/></dir></dir><dir name="Tax"><file name="Mode.php" hash="fb09f17b54ef8ffa22580741cc66ac14"/></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="design"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="iplogistics.xml" hash="dc215a898f4c73c61832b4f64ab2608b"/><file name="iparcel.xml" hash="c75b2082a2d5ceb3e507843ca793ea05"/></dir><dir name="template"><dir name="iplogistics"><dir name="order"><dir name="totals"><file name="duty.phtml" hash="0ea5054e7e70bd6d7b33bb46e0785bfb"/><file name="tax.phtml" hash="b208790d106afa82f2723c0d1ec12ed5"/></dir></dir><dir name="shipment"><dir name="split"><file name="form.phtml" hash="3f6284be75f13da03413d2d7aa96fdda"/><file name="items.phtml" hash="93be5dc4c1feae63a0dc751ae33420a7"/><dir name="renderer"><file name="default.phtml" hash="85053a7fe01567e023a30bbd0a03b27e"/></dir></dir></dir></dir><dir name="iparcel"><dir name="sync"><dir name="ajax"><file name="catalog.phtml" hash="4959462a90a5c2b6c01ba722b73e8f58"/><file name="checkitems.phtml" hash="c19b0e4fd0feddedbc2cef3b2f4ce79b"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="iplogistics.xml" hash="01774751e5a2cd7a3356eb5ca8f39faf"/></dir></dir></dir></dir></dir><dir name="locale"><dir name="en_US"><file name="iplogistics.csv" hash=""/></dir></dir></dir><dir name="js"><dir name="iparcel-logistics"><dir name="adminhtml"><file name="shipping-methods.js" hash="eca91e8a5cf152fce7af0eb5bf2991bb"/></dir></dir><dir name="iparcel"><dir name="adminhtml"><file name="sync.js" hash="bcfc390768020ce3e532f594c8f6df81"/></dir></dir></dir><dir name="skin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="iparcel"><file name="ajaxSync.css" hash="c622b9e4b77589bc0f3c0555124d2751"/></dir></dir></dir></dir></dir></target></contents>
|
22 |
<compatible/>
|
23 |
<dependencies>
|
24 |
<required>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>iparcel_logistics</name>
|
4 |
+
<version>1.2.0</version>
|
5 |
<stability>stable</stability>
|
6 |
<license>GPL</license>
|
7 |
<channel>community</channel>
|
16 |
<email>bburden@i-parcel.com</email>
|
17 |
</author>
|
18 |
</authors>
|
19 |
+
<date>2016-03-02</date>
|
20 |
+
<time>16:15:27</time>
|
21 |
+
<contents><target name="mageweb"><dir name="app"><dir name="etc"><dir name="modules"><file name="Iparcel_Logistics.xml" hash="2f375c30334e2d4a6bae03ccab808dd3"/><file name="Iparcel_All.xml" hash="89e4b47a6ac9aa0b82f70b1539d587ea"/></dir></dir><dir name="code"><dir name="community"><dir name="Iparcel"><dir name="Logistics"><dir name="etc"><file name="adminhtml.xml" hash="8b8a4a0643ce23b42709f3b82e46e830"/><file name="config.xml" hash="8b8f64c10ee2e14d31ae6bdc2b9d78d8"/><file name="system.xml" hash="38d506e0c6acd3522f116caeda13477e"/></dir><dir name="Helper"><file name="Api.php" hash="ada246f9d5a93f77a1a487b6cab6490d"/><file name="Data.php" hash="87dc68870f301c88cc6325975039810f"/></dir><dir name="Model"><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="3eee28f86610e6cf1b83ee58b83d5e83"/></dir></dir></dir></dir><dir name="All"><dir name="Block"><dir name="Adminhtml"><dir name="Catalog"><dir name="Mapping"><file name="Button.php" hash="dfdaf5a2fbf824a10fccc952fdccf567"/></dir></dir><dir name="Iparcel"><file name="Dashboard.php" hash="ec9dddd10368136f1bdfe79fddd4500c"/><file name="Logs.php" hash="5823bbc2a78666972dd02d5fd3e9d05d"/><dir name="Logs"><file name="Grid.php" hash="9c472c78640c8aecb5de4b638372e6f5"/></dir><dir name="Shipment"><dir name="Split"><file name="Form.php" hash="db44693b1eda47cb1d87b8a69ac9a5a0"/></dir><file name="Split.php" hash="4cb66f91987f842c699bd2d6c42f2249"/></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Method.php" hash="935a3d4adad09d6c049cd6bb4cefb8db"/></dir></dir></dir></dir></dir><dir name="Catalog"><dir name="Product"><file name="List.php" hash="2969af5eed8a1179579fa182e20cd59e"/></dir><file name="Product.php" hash="71a865c01574fd10ee0ffa7475cee378"/></dir><dir name="Catalogsearch"><dir name="Advanced"><file name="Result.php" hash="ad5a157444b80a284e0f9e7a91187b55"/></dir><file name="Result.php" hash="33e4ab0994bde9ba5dd87ade63869bee"/></dir><dir name="Html"><dir name="Head"><file name="Iparcel.php" hash="dd1737d041e9357269fa35b27dbef0bd"/><file name="Jquery.php" hash="3fd23960111c32d5696cc3de63e41b6e"/><file name="Post.php" hash="793d578cf82fb3ba83e1edc87b79ff95"/></dir></dir><dir name="Sales"><dir name="Order"><dir name="Totals"><file name="Abstract.php" hash="71cdfdce9a538b2f78b83b7b5eac8b19"/><file name="Duty.php" hash="f8ae79b70c6b5ba41c7acac9be5d84c0"/><file name="Tax.php" hash="1cfee0fccb1feede23f3cdc22f57c903"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Iparcel"><file name="LogController.php" hash="94e2095979140ad6d7c149080be30d38"/><file name="ShipmentController.php" hash="a9b8896d816b7612e1dc0638a2f8b740"/><file name="SyncController.php" hash="9378f5db27d059bbb36ff1e71bd38d32"/><dir name="Shipment"><file name="SplitController.php" hash="6a294947cf9399e42e90c890a6da2caa"/></dir><dir name="Sync"><file name="AjaxController.php" hash="671afecdeaed8f4c80a85d78605cd6da"/></dir></dir></dir><file name="AjaxController.php" hash="f6b0573eefbb21d7ac863fd029783b3c"/><file name="InfoController.php" hash="6543b1e9803489e507d2470f8e3e408b"/><file name="InternationalController.php" hash="75fc93febe96e328d5927665c33d40d1"/></dir><dir name="etc"><file name="adminhtml.xml" hash="50bc0bee93b5612763321eae11cfdc51"/><file name="config.xml" hash="6f430fb7d7fc681166befb1327119d03"/><file name="system.xml" hash="9f7bf4587539cad7a1b36ac8a01a8b3f"/></dir><dir name="Helper"><file name="Api.php" hash="3eca6912a64291d429075786c9baa2d4"/><file name="Data.php" hash="106253d023fe6ef259a9f2a1fbcb1e28"/><file name="International.php" hash="7bba0cd23188eaa3f99ed3d32ffccd14"/></dir><dir name="Model"><dir name="Api"><file name="Quote.php" hash="2e938bda13d007e73f8c2238aff76fa1"/></dir><dir name="Carrier"><file name="Iparcel.php" hash="ad65fdc9f7f2264e9704b0f17d89dd34"/></dir><dir name="Catalog"><dir name="Product"><file name="Observer.php" hash="d16d89cea8eea6352a7d9b1193cd9512"/></dir></dir><dir name="Config"><dir name="Script"><file name="Js.php" hash="100822286c5326c82cbc5d4ff3cf4c39"/></dir></dir><file name="Cron.php" hash="670d37cd6cdbe60aa69fad8eb0a0759e"/><file name="Log.php" hash="8c87e5f356f8ca77a186430dda106097"/><file name="Observer.php" hash="ad3c34320671927263e673e18c798a34"/><dir name="Order"><dir name="Creditmemo"><dir name="Total"><file name="Duty.php" hash="33b91a5b8fa32293bfe0eab4460b04f9"/><file name="Tax.php" hash="7cd4046231eb8cb9031ae160720390da"/></dir></dir><dir name="Invoice"><dir name="Total"><file name="Duty.php" hash="5a4010994ea502afe88632ddd2699c63"/><file name="Tax.php" hash="c4c95aaaae9662860dd635238150aa46"/></dir></dir></dir><dir name="Payment"><file name="Iparcel.php" hash="30ad607409d5ed225e233638ecbff39c"/></dir><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Abstract.php" hash="a3af320e934f50651e09bfd15b86ffea"/><file name="Collector.php" hash="f99413fe415c342d5c0d582caa767ad1"/><file name="Duty.php" hash="6ef16c8b2038d5c90b4b9c7d00825da2"/><file name="Tax.php" hash="62c9e255562643a967b8c49b9914524d"/></dir></dir></dir><dir name="Resource"><dir name="Api"><file name="Quote.php" hash="84d032b89c5df67ef24a112ad7846302"/></dir><dir name="Log"><file name="Collection.php" hash="7cb78be07207a599eff71c1e18ba0b7a"/></dir><file name="Log.php" hash="d14c2eb8314456a18adadbb52856e0b5"/><dir name="Mysql4"><file name="Setup.php" hash="9f9cf4b5934b70bd00b394beacb245f7"/></dir></dir><dir name="System"><dir name="Config"><dir name="Catalog"><file name="Mapping.php" hash="8895678aa59e49226509d2b4709c5f43"/></dir><dir name="Data"><dir name="Date"><file name="Monthday.php" hash="baec5b8a27c5b037529ba935aae0370a"/><file name="Weekday.php" hash="173edc075325d932f8dad6d4674b8153"/></dir><dir name="Time"><file name="Hour.php" hash="ddad98b85290d9b13ec9f65fbe8a10b3"/><file name="Minute.php" hash="4a76af0057d60e8ff0ff7fedc1d50575"/></dir></dir><file name="Guid.php" hash="311c7f8072f02a6be9e25b6411298c5c"/><dir name="Script"><file name="Js.php" hash="3e3f23b38ecdc361bf6ff6cee1871e92"/></dir><dir name="Source"><dir name="Catalog"><dir name="Mapping"><dir name="Configurable"><file name="Price.php" hash="f9116fd446914467e7fb31bed5a6dd0b"/></dir><file name="Mode.php" hash="36140a050ea65ff23d45264fa67e1a2b"/></dir><dir name="Product"><dir name="Attribute"><file name="Boolean.php" hash="ca1883122659f1b48890ecd46a1590ee"/></dir><file name="Attribute.php" hash="8ca9c929cda497400865751ffba991e6"/></dir></dir><dir name="Date"><file name="Weekday.php" hash="143c26f9661e5dc995ff064e333a2018"/></dir><dir name="Sales"><dir name="Order"><file name="Status.php" hash="f1e414c08c43ebb2fcc6ccf5b41a2ff2"/></dir></dir><dir name="Tax"><file name="Mode.php" hash="fb09f17b54ef8ffa22580741cc66ac14"/></dir></dir></dir></dir><dir name="Tax"><dir name="Quote"><file name="Shipping.php" hash="5d76b072c657035cf3d7713fa6672f1f"/><file name="Subtotal.php" hash="cbd2e41f3bdc74134590a675d93d4bfb"/><file name="Tax.php" hash="ffc8d78a8d0442690c49b60f909c8e48"/></dir></dir></dir><dir name="sql"><dir name="iparcel_setup"><file name="mysql4-upgrade-1.0.0-1.1.0.php" hash="4df6e3a3f2adf96eeb6ccdac213e3f1e"/><file name="mysql4-upgrade-1.1.0-1.1.1.php" hash="cfb9fbc137e7e551dfaece00ac6bb2f4"/><file name="mysql4-upgrade-1.1.1-1.2.0.php" hash="1f04c5c71a6a79aaf74810e87670d998"/></dir></dir></dir></dir></dir></dir><dir name="design"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="iparcel.xml" hash="55aec816cb242fe44aab3a2e0d9de0ba"/><file name="iparcel.xml" hash="55aec816cb242fe44aab3a2e0d9de0ba"/></dir><dir name="template"><dir name="iparcel"><dir name="html"><dir name="head"><file name="iparcel.phtml" hash="07091c9914189cfef06af8cc6e41855c"/><file name="jquery.phtml" hash="c287cb0aa4ddd1f04f27cb5df605a27d"/><file name="post.phtml" hash="1a53e744668b250175ba275b4260050b"/><file name="iparcel.phtml" hash="07091c9914189cfef06af8cc6e41855c"/><file name="jquery.phtml" hash="c287cb0aa4ddd1f04f27cb5df605a27d"/><file name="post.phtml" hash="1a53e744668b250175ba275b4260050b"/></dir></dir><dir name="post"><file name="list.phtml" hash="20e5d7d7f82e1f8d951a1509921eb3bf"/><file name="list.phtml" hash="20e5d7d7f82e1f8d951a1509921eb3bf"/></dir><file name="post.phtml" hash="3827cab2dba981556aeb8ec915ab03cc"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="iparcel.xml" hash="7f877536f54051b41ccef5666a2f24cc"/></dir><dir name="template"><dir name="iparcel"><dir name="order"><dir name="totals"><file name="duty.phtml" hash="7af41c6d47dafeb890a520d8e6e39910"/><file name="tax.phtml" hash="25bffd2b58554cf28e5f4abe4b4e1e7c"/></dir></dir><dir name="sync"><dir name="ajax"><file name="catalog.phtml" hash="4959462a90a5c2b6c01ba722b73e8f58"/><file name="checkitems.phtml" hash="c19b0e4fd0feddedbc2cef3b2f4ce79b"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="locale"><dir name="en_US"><file name="iparcel.csv" hash="cbcb75a490376ca0b63c8c66622c1656"/></dir></dir></dir><dir name="js"><dir name="iparcel"><dir name="adminhtml"><file name="shipping-methods.js" hash="eca91e8a5cf152fce7af0eb5bf2991bb"/><file name="sync.js" hash="bcfc390768020ce3e532f594c8f6df81"/><file name="shipping-methods.js" hash="eca91e8a5cf152fce7af0eb5bf2991bb"/><file name="sync.js" hash="bcfc390768020ce3e532f594c8f6df81"/><file name="shipping-methods.js" hash="eca91e8a5cf152fce7af0eb5bf2991bb"/><file name="sync.js" hash="bcfc390768020ce3e532f594c8f6df81"/><file name="shipping-methods.js" hash="eca91e8a5cf152fce7af0eb5bf2991bb"/><file name="sync.js" hash="bcfc390768020ce3e532f594c8f6df81"/><file name="shipping-methods.js" hash="eca91e8a5cf152fce7af0eb5bf2991bb"/><file name="sync.js" hash="bcfc390768020ce3e532f594c8f6df81"/></dir><file name="jQuery.js" hash="8fc25e27d42774aeae6edbc0a18b72aa"/><file name="lib.js" hash="29d52bf315386c3c8a9b7a7d6e277dfc"/><file name="post.js" hash="c710697e3d4905a6a707222728485047"/><file name="jQuery.js" hash="8fc25e27d42774aeae6edbc0a18b72aa"/><file name="lib.js" hash="29d52bf315386c3c8a9b7a7d6e277dfc"/><file name="post.js" hash="c710697e3d4905a6a707222728485047"/><file name="jQuery.js" hash="8fc25e27d42774aeae6edbc0a18b72aa"/><file name="lib.js" hash="29d52bf315386c3c8a9b7a7d6e277dfc"/><file name="post.js" hash="c710697e3d4905a6a707222728485047"/></dir></dir><dir name="skin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="iparcel"><file name="ajaxSync.css" hash="c622b9e4b77589bc0f3c0555124d2751"/></dir></dir></dir></dir></dir></target></contents>
|
22 |
<compatible/>
|
23 |
<dependencies>
|
24 |
<required>
|