Version Notes
Shippit Magento Integration module, using the Shippit v3 API.
Allows for retrieving shipping quotes during checkout and sending orders to Shippit.
Also adds Australian States and Territories to the available region options and Authority to Leave and Delivery Comments to the checkout process.
Download this release
Release Info
| Developer | Matthew Muscat |
| Extension | Shippit_Shippit |
| Version | 4.3.10 |
| Comparing to | |
| See all releases | |
Code changes from version 4.3.6 to 4.3.10
- app/code/community/Shippit/Shippit/Block/Adminhtml/System/Config/Form/Field/Renderer/Shippit/ServiceClass.php +1 -5
- app/code/community/Shippit/Shippit/Helper/Sync/Order.php +11 -1
- app/code/community/Shippit/Shippit/Model/Api/Order.php +18 -1
- app/code/community/Shippit/Shippit/Model/Observer/Order/Sync.php +43 -17
- app/code/community/Shippit/Shippit/Model/Request/Api/Order.php +11 -11
- app/code/community/Shippit/Shippit/Model/Request/Sync/Order.php +3 -5
- app/code/community/Shippit/Shippit/Model/Shippit.php +2 -3
- app/code/community/Shippit/Shippit/Model/System/Config/Source/Order/Status/Processing.php +35 -0
- app/code/community/Shippit/Shippit/Model/System/Config/Source/Shippit/Methods.php +5 -9
- app/code/community/Shippit/Shippit/Model/System/Config/Source/Shippit/Order/Status.php +33 -0
- app/code/community/Shippit/Shippit/etc/config.xml +4 -2
- app/code/community/Shippit/Shippit/etc/system.xml +26 -3
- package.xml +4 -4
app/code/community/Shippit/Shippit/Block/Adminhtml/System/Config/Form/Field/Renderer/Shippit/ServiceClass.php
CHANGED
|
@@ -19,11 +19,7 @@ class Shippit_Shippit_Block_Adminhtml_System_Config_Form_Field_Renderer_Shippit_
|
|
| 19 |
protected function _toHtml()
|
| 20 |
{
|
| 21 |
$column = $this->getColumn();
|
| 22 |
-
|
| 23 |
-
// Priority Services are not presented here
|
| 24 |
-
// as they are only available via live quoting
|
| 25 |
-
// due to service availabilty requirements
|
| 26 |
-
$options = Mage::getModel('shippit/system_config_source_shippit_methods')->toOptionArray(false);
|
| 27 |
|
| 28 |
foreach ($options as $option) {
|
| 29 |
$optionsHtml[] = '<option value="' . $option['value'] . '">' . $option['label'] . "</option>";
|
| 19 |
protected function _toHtml()
|
| 20 |
{
|
| 21 |
$column = $this->getColumn();
|
| 22 |
+
$options = Mage::getModel('shippit/system_config_source_shippit_methods')->toOptionArray();
|
|
|
|
|
|
|
|
|
|
|
|
|
| 23 |
|
| 24 |
foreach ($options as $option) {
|
| 25 |
$optionsHtml[] = '<option value="' . $option['value'] . '">' . $option['label'] . "</option>";
|
app/code/community/Shippit/Shippit/Helper/Sync/Order.php
CHANGED
|
@@ -106,7 +106,7 @@ class Shippit_Shippit_Helper_Sync_Order extends Shippit_Shippit_Helper_Data
|
|
| 106 |
|
| 107 |
// allows for legacy capability where
|
| 108 |
// "priority" was referred to as "premium"
|
| 109 |
-
if ($method == 'priority' || $method
|
| 110 |
return 'priority';
|
| 111 |
}
|
| 112 |
elseif ($method == 'express') {
|
|
@@ -129,4 +129,14 @@ class Shippit_Shippit_Helper_Sync_Order extends Shippit_Shippit_Helper_Data
|
|
| 129 |
// All options have failed, return false
|
| 130 |
return false;
|
| 131 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 132 |
}
|
| 106 |
|
| 107 |
// allows for legacy capability where
|
| 108 |
// "priority" was referred to as "premium"
|
| 109 |
+
if ($method == 'priority' || $method == 'premium') {
|
| 110 |
return 'priority';
|
| 111 |
}
|
| 112 |
elseif ($method == 'express') {
|
| 129 |
// All options have failed, return false
|
| 130 |
return false;
|
| 131 |
}
|
| 132 |
+
|
| 133 |
+
public function isFilterOrderStatusActive()
|
| 134 |
+
{
|
| 135 |
+
return self::getStoreConfig('filter_order_status_active');
|
| 136 |
+
}
|
| 137 |
+
|
| 138 |
+
public function getFilterOrderStatus()
|
| 139 |
+
{
|
| 140 |
+
return explode(',', self::getStoreConfig('filter_order_status'));
|
| 141 |
+
}
|
| 142 |
}
|
app/code/community/Shippit/Shippit/Model/Api/Order.php
CHANGED
|
@@ -64,7 +64,7 @@ class Shippit_Shippit_Model_Api_Order extends Mage_Core_Model_Abstract
|
|
| 64 |
{
|
| 65 |
$storeId = $this->getStoreId($store);
|
| 66 |
|
| 67 |
-
|
| 68 |
->getCollection()
|
| 69 |
->join(
|
| 70 |
array('order' => 'sales/order'),
|
|
@@ -77,6 +77,23 @@ class Shippit_Shippit_Model_Api_Order extends Mage_Core_Model_Abstract
|
|
| 77 |
->addFieldToFilter('main_table.attempt_count', array('lteq' => Shippit_Shippit_Model_Sync_Order::SYNC_MAX_ATTEMPTS))
|
| 78 |
->addFieldToFilter('order.state', array('eq' => Mage_Sales_Model_Order::STATE_PROCESSING))
|
| 79 |
->addFieldToFilter('order.store_id', array('eq' => $storeId));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 80 |
}
|
| 81 |
|
| 82 |
private function getStoreId($store)
|
| 64 |
{
|
| 65 |
$storeId = $this->getStoreId($store);
|
| 66 |
|
| 67 |
+
$syncOrders = Mage::getModel('shippit/sync_order')
|
| 68 |
->getCollection()
|
| 69 |
->join(
|
| 70 |
array('order' => 'sales/order'),
|
| 77 |
->addFieldToFilter('main_table.attempt_count', array('lteq' => Shippit_Shippit_Model_Sync_Order::SYNC_MAX_ATTEMPTS))
|
| 78 |
->addFieldToFilter('order.state', array('eq' => Mage_Sales_Model_Order::STATE_PROCESSING))
|
| 79 |
->addFieldToFilter('order.store_id', array('eq' => $storeId));
|
| 80 |
+
|
| 81 |
+
// Check if order status filtering is active
|
| 82 |
+
if ($this->helper->isFilterOrderStatusActive()) {
|
| 83 |
+
$filterStatus = $this->helper->getFilterOrderStatus();
|
| 84 |
+
|
| 85 |
+
// ensure there is a filtering value present
|
| 86 |
+
if (!empty($filterStatus)) {
|
| 87 |
+
$syncOrders->addFieldToFilter(
|
| 88 |
+
'order.status',
|
| 89 |
+
array(
|
| 90 |
+
'in' => $filterStatus
|
| 91 |
+
)
|
| 92 |
+
);
|
| 93 |
+
}
|
| 94 |
+
}
|
| 95 |
+
|
| 96 |
+
return $syncOrders;
|
| 97 |
}
|
| 98 |
|
| 99 |
private function getStoreId($store)
|
app/code/community/Shippit/Shippit/Model/Observer/Order/Sync.php
CHANGED
|
@@ -46,7 +46,7 @@ class Shippit_Shippit_Model_Observer_Order_Sync
|
|
| 46 |
$order = $observer->getEvent()->getOrder();
|
| 47 |
|
| 48 |
// Ensure we have an order
|
| 49 |
-
if (!$order || !$order->getId()) {
|
| 50 |
return $this;
|
| 51 |
}
|
| 52 |
|
|
@@ -79,8 +79,12 @@ class Shippit_Shippit_Model_Observer_Order_Sync
|
|
| 79 |
// If the sync mode is realtime,
|
| 80 |
// or the shipping method is priority
|
| 81 |
// - attempt realtime sync now
|
| 82 |
-
if ($this->helper->getMode() == Shippit_Shippit_Helper_Data::SYNC_MODE_REALTIME
|
| 83 |
-
|| $shippitShippingMethod == 'priority')
|
|
|
|
|
|
|
|
|
|
|
|
|
| 84 |
$this->_syncOrder($syncOrder);
|
| 85 |
}
|
| 86 |
}
|
|
@@ -95,22 +99,44 @@ class Shippit_Shippit_Model_Observer_Order_Sync
|
|
| 95 |
|
| 96 |
private function _syncOrder($syncOrder)
|
| 97 |
{
|
| 98 |
-
$
|
| 99 |
-
|
| 100 |
-
|
| 101 |
-
|
| 102 |
-
|
| 103 |
-
|
| 104 |
-
|
| 105 |
-
|
| 106 |
-
|
| 107 |
-
|
| 108 |
-
|
| 109 |
-
|
| 110 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 111 |
}
|
| 112 |
-
|
|
|
|
| 113 |
return false;
|
| 114 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 115 |
}
|
| 116 |
}
|
| 46 |
$order = $observer->getEvent()->getOrder();
|
| 47 |
|
| 48 |
// Ensure we have an order
|
| 49 |
+
if (!$order || !$order->getId() || $order->getIsVirtual()) {
|
| 50 |
return $this;
|
| 51 |
}
|
| 52 |
|
| 79 |
// If the sync mode is realtime,
|
| 80 |
// or the shipping method is priority
|
| 81 |
// - attempt realtime sync now
|
| 82 |
+
if (($this->helper->getMode() == Shippit_Shippit_Helper_Data::SYNC_MODE_REALTIME
|
| 83 |
+
|| $shippitShippingMethod == 'priority')
|
| 84 |
+
// we use the order object passed in the event
|
| 85 |
+
// handler, as the syncOrder object does yet
|
| 86 |
+
// have the order status details in the DB
|
| 87 |
+
&& $this->_canSync($syncOrder, $order)) {
|
| 88 |
$this->_syncOrder($syncOrder);
|
| 89 |
}
|
| 90 |
}
|
| 99 |
|
| 100 |
private function _syncOrder($syncOrder)
|
| 101 |
{
|
| 102 |
+
$this->_hasAttemptedSync = true;
|
| 103 |
+
|
| 104 |
+
// attempt the sync
|
| 105 |
+
$syncOrderResult = Mage::getModel('shippit/api_order')->sync($syncOrder);
|
| 106 |
+
|
| 107 |
+
return $syncOrderResult;
|
| 108 |
+
}
|
| 109 |
+
|
| 110 |
+
/**
|
| 111 |
+
* Determines whether the sync order can be sent now
|
| 112 |
+
*
|
| 113 |
+
* @param Object $syncOrder The sync order object being evaluated
|
| 114 |
+
* @return Boolean True or false
|
| 115 |
+
*/
|
| 116 |
+
private function _canSync($syncOrder, $order)
|
| 117 |
+
{
|
| 118 |
+
if ($this->_hasAttemptedSync) {
|
| 119 |
+
return false;
|
| 120 |
+
}
|
| 121 |
+
|
| 122 |
+
if ($order->getState() !== Mage_Sales_Model_Order::STATE_PROCESSING) {
|
| 123 |
+
return false;
|
| 124 |
}
|
| 125 |
+
|
| 126 |
+
if ($syncOrder->getStatus() == Shippit_Shippit_Model_Sync_Order::STATUS_PENDING) {
|
| 127 |
return false;
|
| 128 |
}
|
| 129 |
+
|
| 130 |
+
// Check if sync by order status is active
|
| 131 |
+
if ($this->helper->isFilterOrderStatusActive()) {
|
| 132 |
+
$filterStatus = $this->helper->getFilterOrderStatus();
|
| 133 |
+
$orderStatus = $order->getStatus();
|
| 134 |
+
|
| 135 |
+
if (!in_array($orderStatus, $filterStatus)) {
|
| 136 |
+
return false;
|
| 137 |
+
}
|
| 138 |
+
}
|
| 139 |
+
|
| 140 |
+
return true;
|
| 141 |
}
|
| 142 |
}
|
app/code/community/Shippit/Shippit/Model/Request/Api/Order.php
CHANGED
|
@@ -358,13 +358,6 @@ class Shippit_Shippit_Model_Request_Api_Order extends Varien_Object
|
|
| 358 |
*/
|
| 359 |
public function setShippingMethod($shippingMethod = null)
|
| 360 |
{
|
| 361 |
-
// if the order is a priority delivery,
|
| 362 |
-
// get the special delivery attributes
|
| 363 |
-
if ($shippingMethod == 'priority') {
|
| 364 |
-
$deliveryDate = $this->_getOrderDeliveryDate($this->order);
|
| 365 |
-
$deliveryWindow = $this->_getOrderDeliveryWindow($this->order);
|
| 366 |
-
}
|
| 367 |
-
|
| 368 |
// set the courier details based on the shipping method
|
| 369 |
if ($shippingMethod == 'standard') {
|
| 370 |
return $this->setCourierType(self::SHIPPING_SERVICE_STANDARD);
|
|
@@ -372,10 +365,17 @@ class Shippit_Shippit_Model_Request_Api_Order extends Varien_Object
|
|
| 372 |
elseif ($shippingMethod == 'express') {
|
| 373 |
return $this->setCourierType(self::SHIPPING_SERVICE_EXPRESS);
|
| 374 |
}
|
| 375 |
-
elseif ($shippingMethod == 'priority'
|
| 376 |
-
|
| 377 |
-
|
| 378 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 379 |
}
|
| 380 |
elseif ($shippingMethod == 'international') {
|
| 381 |
return $this->setCourierType(self::SHIPPING_SERVICE_INTERNATIONAL);
|
| 358 |
*/
|
| 359 |
public function setShippingMethod($shippingMethod = null)
|
| 360 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 361 |
// set the courier details based on the shipping method
|
| 362 |
if ($shippingMethod == 'standard') {
|
| 363 |
return $this->setCourierType(self::SHIPPING_SERVICE_STANDARD);
|
| 365 |
elseif ($shippingMethod == 'express') {
|
| 366 |
return $this->setCourierType(self::SHIPPING_SERVICE_EXPRESS);
|
| 367 |
}
|
| 368 |
+
elseif ($shippingMethod == 'priority') {
|
| 369 |
+
// get the special delivery attributes
|
| 370 |
+
$deliveryDate = $this->_getOrderDeliveryDate($this->order);
|
| 371 |
+
$deliveryWindow = $this->_getOrderDeliveryWindow($this->order);
|
| 372 |
+
|
| 373 |
+
if (!empty($deliveryDate) && !empty($deliveryWindow)) {
|
| 374 |
+
$this->setDeliveryDate($deliveryDate);
|
| 375 |
+
$this->setDeliveryWindow($deliveryWindow);
|
| 376 |
+
}
|
| 377 |
+
|
| 378 |
+
return $this->setCourierType(self::SHIPPING_SERVICE_PRIORITY);
|
| 379 |
}
|
| 380 |
elseif ($shippingMethod == 'international') {
|
| 381 |
return $this->setCourierType(self::SHIPPING_SERVICE_INTERNATIONAL);
|
app/code/community/Shippit/Shippit/Model/Request/Sync/Order.php
CHANGED
|
@@ -127,14 +127,12 @@ class Shippit_Shippit_Model_Request_Sync_Order extends Varien_Object
|
|
| 127 |
|
| 128 |
public function setShippingMethod($shippingMethod)
|
| 129 |
{
|
| 130 |
-
// Standard, express and
|
| 131 |
-
// Priority services requires the use of live quoting to determine
|
| 132 |
-
// booking availability
|
| 133 |
$validShippingMethods = array(
|
| 134 |
'standard',
|
| 135 |
'express',
|
| 136 |
-
'
|
| 137 |
-
'
|
| 138 |
);
|
| 139 |
|
| 140 |
// if the shipping method passed is not a standard shippit service class, attempt to get a service class based on the configured mapping
|
| 127 |
|
| 128 |
public function setShippingMethod($shippingMethod)
|
| 129 |
{
|
| 130 |
+
// Standard, express, priority and international options are available
|
|
|
|
|
|
|
| 131 |
$validShippingMethods = array(
|
| 132 |
'standard',
|
| 133 |
'express',
|
| 134 |
+
'priority',
|
| 135 |
+
'international'
|
| 136 |
);
|
| 137 |
|
| 138 |
// if the shipping method passed is not a standard shippit service class, attempt to get a service class based on the configured mapping
|
app/code/community/Shippit/Shippit/Model/Shippit.php
CHANGED
|
@@ -25,11 +25,10 @@ class Shippit_Shippit_Model_Shippit extends Mage_Core_Model_Abstract
|
|
| 25 |
}
|
| 26 |
|
| 27 |
/**
|
| 28 |
-
* Adds the order to the request queue,
|
|
|
|
| 29 |
* attempts to sync the record immediately.
|
| 30 |
*
|
| 31 |
-
* Note: Priority shipping services are only available via live quoting
|
| 32 |
-
*
|
| 33 |
* @param integer $entityId The order entity_id
|
| 34 |
* @param array $items An array of the items to be included
|
| 35 |
* @param string $shippingMethod The shipping method service class to be used (standard, express)
|
| 25 |
}
|
| 26 |
|
| 27 |
/**
|
| 28 |
+
* Adds the order to the request queue,
|
| 29 |
+
* if the mode is requested as realtime,
|
| 30 |
* attempts to sync the record immediately.
|
| 31 |
*
|
|
|
|
|
|
|
| 32 |
* @param integer $entityId The order entity_id
|
| 33 |
* @param array $items An array of the items to be included
|
| 34 |
* @param string $shippingMethod The shipping method service class to be used (standard, express)
|
app/code/community/Shippit/Shippit/Model/System/Config/Source/Order/Status/Processing.php
ADDED
|
@@ -0,0 +1,35 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Shippit Pty Ltd
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the terms
|
| 8 |
+
* that is available through the world-wide-web at this URL:
|
| 9 |
+
* http://www.shippit.com/terms
|
| 10 |
+
*
|
| 11 |
+
* @category Shippit
|
| 12 |
+
* @copyright Copyright (c) 2016 by Shippit Pty Ltd (http://www.shippit.com)
|
| 13 |
+
* @author Matthew Muscat <matthew@mamis.com.au>
|
| 14 |
+
* @license http://www.shippit.com/terms
|
| 15 |
+
*/
|
| 16 |
+
|
| 17 |
+
class Shippit_Shippit_Model_System_Config_Source_Order_Status_Processing
|
| 18 |
+
{
|
| 19 |
+
public function toOptionArray()
|
| 20 |
+
{
|
| 21 |
+
$optionsArray = array();
|
| 22 |
+
|
| 23 |
+
$statuses = Mage::getSingleton('sales/order_config')
|
| 24 |
+
->getStateStatuses(Mage_Sales_Model_Order::STATE_PROCESSING);
|
| 25 |
+
|
| 26 |
+
foreach ($statuses as $statusCode => $statusLabel) {
|
| 27 |
+
$optionsArray[] = array(
|
| 28 |
+
'value' => $statusCode,
|
| 29 |
+
'label' => $statusLabel
|
| 30 |
+
);
|
| 31 |
+
}
|
| 32 |
+
|
| 33 |
+
return $optionsArray;
|
| 34 |
+
}
|
| 35 |
+
}
|
app/code/community/Shippit/Shippit/Model/System/Config/Source/Shippit/Methods.php
CHANGED
|
@@ -21,9 +21,9 @@ class Shippit_Shippit_Model_System_Config_Source_Shippit_Methods
|
|
| 21 |
*
|
| 22 |
* @return array
|
| 23 |
*/
|
| 24 |
-
public function toOptionArray(
|
| 25 |
{
|
| 26 |
-
$methods = $this->getMethods(
|
| 27 |
$methodOptions = array();
|
| 28 |
|
| 29 |
foreach ($methods as $methodValue => $methodLabel) {
|
|
@@ -36,19 +36,15 @@ class Shippit_Shippit_Model_System_Config_Source_Shippit_Methods
|
|
| 36 |
return $methodOptions;
|
| 37 |
}
|
| 38 |
|
| 39 |
-
public function getMethods(
|
| 40 |
{
|
| 41 |
$methods = array(
|
| 42 |
'standard' => 'Standard',
|
| 43 |
'express' => 'Express',
|
|
|
|
|
|
|
| 44 |
);
|
| 45 |
|
| 46 |
-
if ($includePriority) {
|
| 47 |
-
$methods['priority'] = 'Priority';
|
| 48 |
-
}
|
| 49 |
-
|
| 50 |
-
$methods['international'] = 'International';
|
| 51 |
-
|
| 52 |
return $methods;
|
| 53 |
}
|
| 54 |
}
|
| 21 |
*
|
| 22 |
* @return array
|
| 23 |
*/
|
| 24 |
+
public function toOptionArray()
|
| 25 |
{
|
| 26 |
+
$methods = $this->getMethods();
|
| 27 |
$methodOptions = array();
|
| 28 |
|
| 29 |
foreach ($methods as $methodValue => $methodLabel) {
|
| 36 |
return $methodOptions;
|
| 37 |
}
|
| 38 |
|
| 39 |
+
public function getMethods()
|
| 40 |
{
|
| 41 |
$methods = array(
|
| 42 |
'standard' => 'Standard',
|
| 43 |
'express' => 'Express',
|
| 44 |
+
'priority' => 'Priority',
|
| 45 |
+
'international' => 'International'
|
| 46 |
);
|
| 47 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 48 |
return $methods;
|
| 49 |
}
|
| 50 |
}
|
app/code/community/Shippit/Shippit/Model/System/Config/Source/Shippit/Order/Status.php
ADDED
|
@@ -0,0 +1,33 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Shippit Pty Ltd
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the terms
|
| 8 |
+
* that is available through the world-wide-web at this URL:
|
| 9 |
+
* http://www.shippit.com/terms
|
| 10 |
+
*
|
| 11 |
+
* @category Shippit
|
| 12 |
+
* @copyright Copyright (c) 2016 by Shippit Pty Ltd (http://www.shippit.com)
|
| 13 |
+
* @author Matthew Muscat <matthew@mamis.com.au>
|
| 14 |
+
* @license http://www.shippit.com/terms
|
| 15 |
+
*/
|
| 16 |
+
|
| 17 |
+
class Shippit_Shippit_Model_System_Config_Source_Shippit_Order_Status
|
| 18 |
+
{
|
| 19 |
+
public function toOptionArray()
|
| 20 |
+
{
|
| 21 |
+
$optionsArray = array();
|
| 22 |
+
|
| 23 |
+
$orderStatusCollection = Mage::getModel('sales/order_status')->getResourceCollection()->getData();
|
| 24 |
+
|
| 25 |
+
foreach($orderStatusCollection as $orderStatus) {
|
| 26 |
+
$optionsArray[] = array (
|
| 27 |
+
'value' => $orderStatus['status'], 'label' => $orderStatus['label']
|
| 28 |
+
);
|
| 29 |
+
}
|
| 30 |
+
|
| 31 |
+
return $optionsArray;
|
| 32 |
+
}
|
| 33 |
+
}
|
app/code/community/Shippit/Shippit/etc/config.xml
CHANGED
|
@@ -18,7 +18,7 @@
|
|
| 18 |
<config>
|
| 19 |
<modules>
|
| 20 |
<Shippit_Shippit>
|
| 21 |
-
<version>4.3.
|
| 22 |
</Shippit_Shippit>
|
| 23 |
</modules>
|
| 24 |
|
|
@@ -268,6 +268,8 @@
|
|
| 268 |
<sync_order>
|
| 269 |
<active>0</active>
|
| 270 |
<manual_sync_active>0</manual_sync_active>
|
|
|
|
|
|
|
| 271 |
<mode>realtime</mode>
|
| 272 |
<send_all_orders>no</send_all_orders>
|
| 273 |
<product_unit_weight>kilograms</product_unit_weight>
|
|
@@ -302,4 +304,4 @@
|
|
| 302 |
</shippit>
|
| 303 |
</carriers>
|
| 304 |
</default>
|
| 305 |
-
</config>
|
| 18 |
<config>
|
| 19 |
<modules>
|
| 20 |
<Shippit_Shippit>
|
| 21 |
+
<version>4.3.10</version>
|
| 22 |
</Shippit_Shippit>
|
| 23 |
</modules>
|
| 24 |
|
| 268 |
<sync_order>
|
| 269 |
<active>0</active>
|
| 270 |
<manual_sync_active>0</manual_sync_active>
|
| 271 |
+
<filter_order_status_active>0</filter_order_status_active>
|
| 272 |
+
<filter_order_status />
|
| 273 |
<mode>realtime</mode>
|
| 274 |
<send_all_orders>no</send_all_orders>
|
| 275 |
<product_unit_weight>kilograms</product_unit_weight>
|
| 304 |
</shippit>
|
| 305 |
</carriers>
|
| 306 |
</default>
|
| 307 |
+
</config>
|
app/code/community/Shippit/Shippit/etc/system.xml
CHANGED
|
@@ -132,11 +132,34 @@
|
|
| 132 |
<show_in_store>0</show_in_store>
|
| 133 |
<comment>Add a button on the order view and a mass action on the order grid to enable a manual sync of orders with Shippit</comment>
|
| 134 |
</manual_sync_active>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 135 |
<mode translate="label">
|
| 136 |
<label>Mode</label>
|
| 137 |
<frontend_type>select</frontend_type>
|
| 138 |
<source_model>shippit/system_config_source_shippit_sync_mode</source_model>
|
| 139 |
-
<sort_order>
|
| 140 |
<show_in_default>1</show_in_default>
|
| 141 |
<show_in_website>1</show_in_website>
|
| 142 |
<show_in_store>0</show_in_store>
|
|
@@ -145,7 +168,7 @@
|
|
| 145 |
<label>Send All Orders to Shippit</label>
|
| 146 |
<frontend_type>select</frontend_type>
|
| 147 |
<source_model>shippit/system_config_source_shippit_sync_sendAllOrders</source_model>
|
| 148 |
-
<sort_order>
|
| 149 |
<show_in_default>1</show_in_default>
|
| 150 |
<show_in_website>1</show_in_website>
|
| 151 |
<show_in_store>0</show_in_store>
|
|
@@ -192,7 +215,7 @@
|
|
| 192 |
<show_in_default>1</show_in_default>
|
| 193 |
<show_in_website>1</show_in_website>
|
| 194 |
<show_in_store>1</show_in_store>
|
| 195 |
-
<comment>A mapping of the Magento Shipping Methods to Shippit Services classes</comment>
|
| 196 |
</shipping_method_mapping>
|
| 197 |
</fields>
|
| 198 |
</sync_order>
|
| 132 |
<show_in_store>0</show_in_store>
|
| 133 |
<comment>Add a button on the order view and a mass action on the order grid to enable a manual sync of orders with Shippit</comment>
|
| 134 |
</manual_sync_active>
|
| 135 |
+
<filter_order_status_active>
|
| 136 |
+
<label>Order Status Filtering</label>
|
| 137 |
+
<frontend_type>select</frontend_type>
|
| 138 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 139 |
+
<sort_order>30</sort_order>
|
| 140 |
+
<show_in_default>1</show_in_default>
|
| 141 |
+
<show_in_website>1</show_in_website>
|
| 142 |
+
<show_in_store>0</show_in_store>
|
| 143 |
+
<comment>By default, all orders in the "processing" state are automatically synced with shippit. Enable this option to specify the order statuses to be synced automatically.</comment>
|
| 144 |
+
</filter_order_status_active>
|
| 145 |
+
<filter_order_status>
|
| 146 |
+
<label>Order Statuses</label>
|
| 147 |
+
<frontend_type>multiselect</frontend_type>
|
| 148 |
+
<source_model>shippit/system_config_source_order_status_processing</source_model>
|
| 149 |
+
<sort_order>40</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 |
+
<depends>
|
| 154 |
+
<filter_order_status_active>1</filter_order_status_active>
|
| 155 |
+
</depends>
|
| 156 |
+
<comment>The order statuses to be synced automatically</comment>
|
| 157 |
+
</filter_order_status>
|
| 158 |
<mode translate="label">
|
| 159 |
<label>Mode</label>
|
| 160 |
<frontend_type>select</frontend_type>
|
| 161 |
<source_model>shippit/system_config_source_shippit_sync_mode</source_model>
|
| 162 |
+
<sort_order>50</sort_order>
|
| 163 |
<show_in_default>1</show_in_default>
|
| 164 |
<show_in_website>1</show_in_website>
|
| 165 |
<show_in_store>0</show_in_store>
|
| 168 |
<label>Send All Orders to Shippit</label>
|
| 169 |
<frontend_type>select</frontend_type>
|
| 170 |
<source_model>shippit/system_config_source_shippit_sync_sendAllOrders</source_model>
|
| 171 |
+
<sort_order>60</sort_order>
|
| 172 |
<show_in_default>1</show_in_default>
|
| 173 |
<show_in_website>1</show_in_website>
|
| 174 |
<show_in_store>0</show_in_store>
|
| 215 |
<show_in_default>1</show_in_default>
|
| 216 |
<show_in_website>1</show_in_website>
|
| 217 |
<show_in_store>1</show_in_store>
|
| 218 |
+
<comment>A mapping of the Magento Shipping Methods to Shippit Services classes - please note: priority mapping will book the next available timeslot</comment>
|
| 219 |
</shipping_method_mapping>
|
| 220 |
</fields>
|
| 221 |
</sync_order>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Shippit_Shippit</name>
|
| 4 |
-
<version>4.3.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>Open Software Licence</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -18,9 +18,9 @@ Allows for retrieving shipping quotes during checkout and sending orders to Ship
|
|
| 18 |

|
| 19 |
Also adds Australian States and Territories to the available region options and Authority to Leave and Delivery Comments to the checkout process.</notes>
|
| 20 |
<authors><author><name>Matthew Muscat</name><user>matthewmuscat</user><email>matthew@mamis.com.au</email></author><author><name>William On</name><user>williamon</user><email>will@shippit.com</email></author></authors>
|
| 21 |
-
<date>2016-
|
| 22 |
-
<time>
|
| 23 |
-
<contents><target name="magelib"><dir name="shippit-bugsnag"><file name="Autoload.php" hash="141a845b8baaebee4232b30540d5cda5"/><file name="Client.php" hash="1899cce9e4e05aa200c5c05ef2c0f52d"/><file name="Configuration.php" hash="c4a28bb83e49dfb24ff15e3daebbe156"/><file name="Diagnostics.php" hash="ee57a579dec73e922465d417cfecccf6"/><file name="Error.php" hash="f8d179e9406a6c0a958d06367b9e64e0"/><file name="ErrorTypes.php" hash="d52493e689517f479abb21599e9c1989"/><file name="Notification.php" hash="98ac2f24e77a96fe8f274e9694a33dd4"/><file name="Request.php" hash="ff8dbf358238351801518bad62138491"/><file name="Stacktrace.php" hash="2f7b8e1172f04071ce70b5b53cfe55ee"/></dir></target><target name="magecommunity"><dir name="Shippit"><dir name="Shippit"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="9208ed6e0b222590610f6a3e2a3ac254"/><file name="Items.php" hash="275116a2c42700de7a65fc9e0a6568c6"/></dir><file name="Order.php" hash="665a08b5f3f6432ba49327ad0d320572"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><dir name="Renderer"><dir name="Shipping"><file name="Methods.php" hash="26428642657de1a0f0d22140fd84174d"/></dir><dir name="Shippit"><file name="ServiceClass.php" hash="
|
| 24 |
<compatible/>
|
| 25 |
<dependencies><required><php><min>5.2.0</min><max>8.0.0</max></php></required></dependencies>
|
| 26 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Shippit_Shippit</name>
|
| 4 |
+
<version>4.3.10</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>Open Software Licence</license>
|
| 7 |
<channel>community</channel>
|
| 18 |

|
| 19 |
Also adds Australian States and Territories to the available region options and Authority to Leave and Delivery Comments to the checkout process.</notes>
|
| 20 |
<authors><author><name>Matthew Muscat</name><user>matthewmuscat</user><email>matthew@mamis.com.au</email></author><author><name>William On</name><user>williamon</user><email>will@shippit.com</email></author></authors>
|
| 21 |
+
<date>2016-08-23</date>
|
| 22 |
+
<time>05:54:03</time>
|
| 23 |
+
<contents><target name="magelib"><dir name="shippit-bugsnag"><file name="Autoload.php" hash="141a845b8baaebee4232b30540d5cda5"/><file name="Client.php" hash="1899cce9e4e05aa200c5c05ef2c0f52d"/><file name="Configuration.php" hash="c4a28bb83e49dfb24ff15e3daebbe156"/><file name="Diagnostics.php" hash="ee57a579dec73e922465d417cfecccf6"/><file name="Error.php" hash="f8d179e9406a6c0a958d06367b9e64e0"/><file name="ErrorTypes.php" hash="d52493e689517f479abb21599e9c1989"/><file name="Notification.php" hash="98ac2f24e77a96fe8f274e9694a33dd4"/><file name="Request.php" hash="ff8dbf358238351801518bad62138491"/><file name="Stacktrace.php" hash="2f7b8e1172f04071ce70b5b53cfe55ee"/></dir></target><target name="magecommunity"><dir name="Shippit"><dir name="Shippit"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="9208ed6e0b222590610f6a3e2a3ac254"/><file name="Items.php" hash="275116a2c42700de7a65fc9e0a6568c6"/></dir><file name="Order.php" hash="665a08b5f3f6432ba49327ad0d320572"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><dir name="Renderer"><dir name="Shipping"><file name="Methods.php" hash="26428642657de1a0f0d22140fd84174d"/></dir><dir name="Shippit"><file name="ServiceClass.php" hash="7573d99e768fa6e2c4dc136a54f0d9fd"/></dir></dir><dir name="Sync"><dir name="Order"><file name="ShippingMethodMapping.php" hash="7296f3ac577b89c36c68693ab1a84a32"/></dir></dir></dir><dir name="Fieldset"><file name="Version.php" hash="6cbff78c307a14e3eed4219f180901b1"/></dir></dir></dir></dir></dir><dir name="Checkout"><dir name="Cart"><file name="Shipping.php" hash="dd5dc61d665da4746e5c2a4fc6df089f"/></dir><dir name="Shipping"><file name="AuthorityToLeave.php" hash="241ff5d226c8f848b9895b767883dc30"/><file name="DeliveryInstructions.php" hash="77b5fb807d9dfdd8b5b6bfab6f8df9a6"/></dir></dir></dir><file name="Exception.php" hash="909594393898823a108bab9c6a2e77ed"/><dir name="Helper"><file name="Api.php" hash="17386e28d75bc9ec3cc38e0e91d597cc"/><file name="Bugsnag.php" hash="ae4f276ee853abaf75ffbaf9de08cc08"/><file name="Carrier.php" hash="f7d031b67b5c9beec38214236ff30b5a"/><file name="Checkout.php" hash="004418f9ee0de6ba090faa32e540d8a3"/><file name="Data.php" hash="df6ea2d54c389f91721dc28c72b1dea1"/><dir name="Sync"><dir name="Order"><file name="Items.php" hash="c2031228b78726051a4096054a80363b"/></dir><file name="Order.php" hash="cbdb9511638e9854de82d67017008739"/><file name="Shipping.php" hash="c19889222cffbddf178a6236f78ae41c"/></dir></dir><dir name="Model"><dir name="Api"><file name="Order.php" hash="8163a93c23b9b90b0dc7ab942bd36f57"/></dir><file name="Logger.php" hash="64ed33a2d7554a9da58a080e3462504e"/><dir name="Observer"><dir name="Adminhtml"><dir name="Sales"><file name="Order.php" hash="44393a4d02ea135f68d74ca8ec37394a"/></dir></dir><dir name="Order"><file name="Sync.php" hash="a4f15047fb0fd2681c950498992d7aac"/></dir><dir name="Quote"><file name="AuthorityToLeave.php" hash="c675772dcb25d6a35372f46060b3a8e4"/><file name="DeliveryInstructions.php" hash="8cf1353e6406710208a5312c9cd68c7d"/></dir><dir name="Shipping"><file name="Tracking.php" hash="988cffc30e8d606ba6a2754ba4b2d3a3"/></dir><file name="Shippit.php" hash="3625385600a8e3f0c64492bfaac9c681"/><dir name="System"><file name="Config.php" hash="e5515b7d0cccde3ad7bb70fbe33a3f0b"/></dir></dir><dir name="Request"><dir name="Api"><file name="Order.php" hash="d1f946cf00fe289200232b7bf37b5bb7"/><file name="Shipment.php" hash="af1b78ce51f1d8b89a9c1e9bc6b81ed5"/></dir><dir name="Sync"><file name="Order.php" hash="a5dbd48a76f92d138325a737c1fae313"/></dir></dir><dir name="Resource"><file name="Setup.php" hash="8eb28f6cf5f637597d5f0ad668b64269"/><dir name="Sync"><dir name="Order"><file name="Collection.php" hash="b6fc680edfd57d6cbf810290799dad2c"/><dir name="Item"><file name="Collection.php" hash="935dd5847558e6629ea671b91ad9a1df"/></dir><file name="Item.php" hash="1ba227660a2d1ad09283c312e7e88a98"/></dir><file name="Order.php" hash="4808f4501b760ac09af24fba0df7494d"/></dir></dir><dir name="Shipping"><dir name="Carrier"><file name="Shippit.php" hash="eaf1fc6ec3a58fc1a3adecf07ec5bd8b"/></dir></dir><file name="Shippit.php" hash="d48601c7f37bf3328b2e863d41d5fe13"/><dir name="Sync"><dir name="Order"><file name="Config.php" hash="f52faaf68213e313746abde13781350e"/><file name="Item.php" hash="dee4de2286845cdaed924f81dfeeab51"/></dir><file name="Order.php" hash="460b020cd0a44d8f956e415fbccae620"/></dir><dir name="System"><dir name="Config"><dir name="Source"><dir name="Catalog"><dir name="Attributes"><file name="Location.php" hash="b2fcaaabfa58d290d731e3b09b0afb5d"/></dir><file name="Attributes.php" hash="1f051ddfcea5034c3b0f299ed35d2c7c"/><file name="Products.php" hash="6e78a631987441e8228ee410fe5addd2"/><dir name="Unit"><file name="Weight.php" hash="9d15b42826be4e39c3f2a105826cf6be"/></dir></dir><dir name="Order"><dir name="Status"><file name="Processing.php" hash="1cd4481df806b98b5b20afefe8c16e38"/></dir></dir><dir name="Shipping"><file name="Methods.php" hash="683dd6c9d412d52be6941ec1aec0e1eb"/></dir><dir name="Shippit"><file name="Environment.php" hash="a71561807ce05052a678a5d8d0656695"/><file name="MaxTimeslots.php" hash="a87f36fb06a9e9b79c1ffdc5ff1c42c0"/><file name="Methods.php" hash="41675a89d439dfb0e6ba17d1f323febd"/><dir name="Order"><file name="Status.php" hash="fcd986d9d3634cf257d58c212ae650c8"/></dir><dir name="Sync"><file name="Mode.php" hash="64ff642d93ad9505f160f48b5061efae"/><file name="SendAllOrders.php" hash="99fc5b1dcb2d49768025194cd02aba0e"/></dir></dir></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Shippit"><dir name="Order"><file name="SyncController.php" hash="d5a22ab5fe1346e68d7967e9cad20402"/></dir><file name="OrderController.php" hash="7d4e2c615b524c211d75b4b7c4edc0e7"/></dir></dir><file name="OrderController.php" hash="6d5fe674fd570b6d7b8acc761e450de6"/></dir><dir name="data"><dir name="shippit_setup"><file name="data-install-4.0.0.php" hash="fcc2ad84912ffaf9dc07b866f5fd7460"/><file name="data-upgrade-4.1.0-4.1.1.php" hash="aebc8c802bf8af45219500526da944fa"/><file name="data-upgrade-4.1.6-4.1.7.php" hash="2b2fe61d97645521516728a329cba9ad"/><file name="data-upgrade-4.2.3-4.2.4.php" hash="bd3ed5e70b9349d830fa789e0b394d83"/><file name="data-upgrade-4.3.2-4.3.3.php" hash="3699a8b74b0898f48ec1b9daeb3fcfcc"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="fb2576b73bea6a323cfd157e95c25e90"/><file name="config.xml" hash="868f52255c36a30b33c8a882a14f1fb3"/><file name="system.xml" hash="f6ea042a7657ed35ee931663068b2908"/></dir><dir name="sql"><dir name="shippit_setup"><file name="install-4.0.0.php" hash="19a0a09b6a10c89b73edc7f0a744fe5a"/><file name="upgrade-4.0.9-4.1.0.php" hash="35e56aeea2b78bba82e845d4c4c16fc1"/><file name="upgrade-4.1.0-4.1.1.php" hash="5c675c05272472cdd7c585aa6db750d9"/><file name="upgrade-4.2.5-4.2.6.php" hash="15dd734c1f7797d8cd0ff5b91a2dda55"/><file name="upgrade-4.2.6-4.3.0.php" hash="635d87318271636ed348a41834c70081"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="shippit.xml" hash="18fa39b7eae780fe993e5140270ffefe"/></dir><dir name="template"><dir name="shippit"><dir name="checkout"><dir name="onepage"><dir name="shipping_method"><file name="authoritytoleave.phtml" hash="7a138531233734c55f97de3cb1641a18"/><file name="deliveryinstructions.phtml" hash="cc64f104584b7be4de3e5de3f2c047c0"/></dir><file name="shipping_method.phtml" hash="c7d804a639749b3c7b21e5e228463f88"/></dir></dir><dir name="email"><dir name="order"><dir name="shipment"><file name="track.phtml" hash="c1450ff14e566880d421799852df4014"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="shippit.xml" hash="c0ae616038936a98b9e87124fb1c3127"/></dir><dir name="template"><dir name="shippit"><dir name="system"><dir name="config"><dir name="form"><dir name="field"><file name="array.phtml" hash="46d02a4a01af0e14cb2d0d91665ca03e"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Shippit_Shippit.xml" hash="401f33d7db491808587c51209d8d6a8b"/></dir></target></contents>
|
| 24 |
<compatible/>
|
| 25 |
<dependencies><required><php><min>5.2.0</min><max>8.0.0</max></php></required></dependencies>
|
| 26 |
</package>
|
