Version Notes
New Features:
Duty & Fees Integrated into Tax
Order email can be sent from the store
Improvements:
Faster Speeds
Country Region Fixes
iGlobal Stores Updated API
Download this release
Release Info
| Developer | Matt Flamm |
| Extension | Iglobal_Main |
| Version | 1.2.1 |
| Comparing to | |
| See all releases | |
Code changes from version 1.2.0 to 1.2.1
- app/code/community/Iglobal/Ship/Model/Carrier/Excellence.php +2 -5
- app/code/community/Iglobal/Stores/Block/Cart.php +1 -1
- app/code/community/Iglobal/Stores/Helper/Data.php +0 -4
- app/code/community/Iglobal/Stores/Helper/Url.php +9 -6
- app/code/community/Iglobal/Stores/Model/International/International.php +5 -6
- app/code/community/Iglobal/Stores/Model/Observer.php +3 -3
- app/code/community/Iglobal/Stores/Model/Order.php +38 -38
- app/code/community/Iglobal/Stores/Model/Resource/Setup.php +1 -3
- app/code/community/Iglobal/Stores/Model/Rest.php +1 -1
- app/code/community/Iglobal/Stores/controllers/CheckoutController.php +1 -1
- app/code/community/Iglobal/Stores/etc/adminhtml.xml +1 -1
- app/design/frontend/base/default/template/iglobal/checkout/onepage/link.phtml +1 -1
- app/design/frontend/base/default/template/iglobal/stores/cart.phtml +0 -1
- app/design/frontend/base/default/template/iglobal/stores/igcincludes.phtml +1 -2
- package.xml +7 -5
app/code/community/Iglobal/Ship/Model/Carrier/Excellence.php
CHANGED
|
@@ -10,10 +10,7 @@ implements Mage_Shipping_Model_Carrier_Interface {
|
|
| 10 |
}
|
| 11 |
|
| 12 |
$price = $this->getConfigData('price'); // set a default shipping price maybe 0
|
| 13 |
-
$price = 0;
|
| 14 |
-
|
| 15 |
|
| 16 |
-
$handling = Mage::getStoreConfig('carriers/'.$this->_code.'/handling');
|
| 17 |
$result = Mage::getModel('shipping/rate_result');
|
| 18 |
$show = Mage::registry('shipping_cost');
|
| 19 |
if($show){
|
|
@@ -29,8 +26,8 @@ implements Mage_Shipping_Model_Carrier_Interface {
|
|
| 29 |
$method->setPrice(Mage::registry('shipping_cost'));
|
| 30 |
$method->setCost(Mage::registry('shipping_cost'));
|
| 31 |
} else {
|
| 32 |
-
$method->setPrice($
|
| 33 |
-
$method->setCost($
|
| 34 |
}
|
| 35 |
$result->append($method);
|
| 36 |
|
| 10 |
}
|
| 11 |
|
| 12 |
$price = $this->getConfigData('price'); // set a default shipping price maybe 0
|
|
|
|
|
|
|
| 13 |
|
|
|
|
| 14 |
$result = Mage::getModel('shipping/rate_result');
|
| 15 |
$show = Mage::registry('shipping_cost');
|
| 16 |
if($show){
|
| 26 |
$method->setPrice(Mage::registry('shipping_cost'));
|
| 27 |
$method->setCost(Mage::registry('shipping_cost'));
|
| 28 |
} else {
|
| 29 |
+
$method->setPrice($price);
|
| 30 |
+
$method->setCost($price);
|
| 31 |
}
|
| 32 |
$result->append($method);
|
| 33 |
|
app/code/community/Iglobal/Stores/Block/Cart.php
CHANGED
|
@@ -19,7 +19,7 @@ Zend_Debug::dump($items);
|
|
| 19 |
$my_product = Mage::getModel('catalog/product')->load($item->getProductId());
|
| 20 |
$my_product_url = $my_product->getProductUrl();
|
| 21 |
|
| 22 |
-
echo '<div class="igItemDetails">'
|
| 23 |
echo '<p class="igID">'.$item->getProductId().'</p><br />';
|
| 24 |
echo '<p class="igName">'.$item->getName().'</p><br />';
|
| 25 |
echo '<p class="igSku">'.$item->getSku().'</p><br />';
|
| 19 |
$my_product = Mage::getModel('catalog/product')->load($item->getProductId());
|
| 20 |
$my_product_url = $my_product->getProductUrl();
|
| 21 |
|
| 22 |
+
echo '<div class="igItemDetails">';
|
| 23 |
echo '<p class="igID">'.$item->getProductId().'</p><br />';
|
| 24 |
echo '<p class="igName">'.$item->getName().'</p><br />';
|
| 25 |
echo '<p class="igSku">'.$item->getSku().'</p><br />';
|
app/code/community/Iglobal/Stores/Helper/Data.php
CHANGED
|
@@ -6,8 +6,6 @@ class Iglobal_Stores_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 6 |
|
| 7 |
public function showHiddenProductFields($item)
|
| 8 |
{
|
| 9 |
-
$i = self::$_i;
|
| 10 |
-
|
| 11 |
$sku = $item->getProduct()->getTypeId() == 'bundle' ? substr($item->getSku(), strpos($item->getSku(), '-')+1) : $item->getSku();
|
| 12 |
$id = $item->getProductId();
|
| 13 |
$price = $item->getPrice();
|
|
@@ -20,8 +18,6 @@ class Iglobal_Stores_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 20 |
try {
|
| 21 |
|
| 22 |
$allItemData = Mage::getModel('catalog/product')->load($item['product_id']);
|
| 23 |
-
$weightUnits = "";
|
| 24 |
-
$dimUnits = "";
|
| 25 |
try {
|
| 26 |
$weightUnits = "";
|
| 27 |
if (!empty($allItemData['ig_weight_units'])) {
|
| 6 |
|
| 7 |
public function showHiddenProductFields($item)
|
| 8 |
{
|
|
|
|
|
|
|
| 9 |
$sku = $item->getProduct()->getTypeId() == 'bundle' ? substr($item->getSku(), strpos($item->getSku(), '-')+1) : $item->getSku();
|
| 10 |
$id = $item->getProductId();
|
| 11 |
$price = $item->getPrice();
|
| 18 |
try {
|
| 19 |
|
| 20 |
$allItemData = Mage::getModel('catalog/product')->load($item['product_id']);
|
|
|
|
|
|
|
| 21 |
try {
|
| 22 |
$weightUnits = "";
|
| 23 |
if (!empty($allItemData['ig_weight_units'])) {
|
app/code/community/Iglobal/Stores/Helper/Url.php
CHANGED
|
@@ -4,13 +4,16 @@ class Iglobal_Stores_Helper_Url extends Mage_Checkout_Helper_Url
|
|
| 4 |
|
| 5 |
function getCheckoutUrl()
|
| 6 |
{
|
| 7 |
-
//check if the country is international
|
| 8 |
-
$countryCode = (isset($_COOKIE['igCountry']) ? $_COOKIE['igCountry'] : "");
|
| 9 |
-
$domesticCountries = explode(",", Mage::getStoreConfig('general/country/ig_domestic_countries'));
|
| 10 |
-
$isDomestic = in_array ($countryCode, $domesticCountries) ? 1 : 0;
|
| 11 |
|
| 12 |
-
//return the url
|
| 13 |
-
if (Mage::getStoreConfig('iglobal_integration/igmat/welcome_mat_active')
|
|
|
|
|
|
|
|
|
|
| 14 |
|
| 15 |
// make this a javascript url
|
| 16 |
return "javascript:if(!ig_isDomesticCountry()){window.location.replace (' " . $this->_getUrl('iglobal/checkout') . "');} else {window.location.replace ('" . $this->_getUrl('checkout/onepage') . "');}";
|
| 4 |
|
| 5 |
function getCheckoutUrl()
|
| 6 |
{
|
| 7 |
+
// check if the country is international
|
| 8 |
+
// $countryCode = (isset($_COOKIE['igCountry']) ? $_COOKIE['igCountry'] : "");
|
| 9 |
+
// $domesticCountries = explode(",", Mage::getStoreConfig('general/country/ig_domestic_countries'));
|
| 10 |
+
// $isDomestic = in_array ($countryCode, $domesticCountries) ? 1 : 0;
|
| 11 |
|
| 12 |
+
// return the url
|
| 13 |
+
if (Mage::getStoreConfig('iglobal_integration/igmat/welcome_mat_active')
|
| 14 |
+
&& Mage::getStoreConfig('iglobal_integration/apireqs/ice_toggle')
|
| 15 |
+
&& Mage::getStoreConfig('iglobal_integration/apireqs/use_iframe')) {
|
| 16 |
+
// check for welcome mat //!$isDomestic && Mage::getStoreConfig('iglobal_integration/apireqs/ice_toggle')){ // add checks for other admin configs
|
| 17 |
|
| 18 |
// make this a javascript url
|
| 19 |
return "javascript:if(!ig_isDomesticCountry()){window.location.replace (' " . $this->_getUrl('iglobal/checkout') . "');} else {window.location.replace ('" . $this->_getUrl('checkout/onepage') . "');}";
|
app/code/community/Iglobal/Stores/Model/International/International.php
CHANGED
|
@@ -14,14 +14,14 @@ class Iglobal_Stores_Model_International_International extends Mage_Core_Model_A
|
|
| 14 |
$product = $item->getProduct();
|
| 15 |
$sku = $item->getSku();
|
| 16 |
$dimUnits = $product->getIgDemesionUnits();
|
| 17 |
-
$dim2inch =
|
| 18 |
$weight = $product->getIgWeight();
|
| 19 |
if (empty($weight))
|
| 20 |
{
|
| 21 |
$weight = $item->getWeight();
|
| 22 |
}
|
| 23 |
|
| 24 |
-
$items[] =
|
| 25 |
"description" => $item->getName(),
|
| 26 |
"productId" => $item->getProductId(),
|
| 27 |
"sku" => $product->getTypeId() == 'bundle' ? substr($sku, strpos($sku, '-') + 1) : $sku,
|
|
@@ -36,14 +36,13 @@ class Iglobal_Stores_Model_International_International extends Mage_Core_Model_A
|
|
| 36 |
"imageURL" => str_replace("http:", "https:", Mage::helper('catalog/image')->init($product, 'thumbnail')),
|
| 37 |
"itemDescriptionLong" => $product->getDescription(),
|
| 38 |
|
| 39 |
-
|
| 40 |
}
|
| 41 |
|
| 42 |
$rest = Mage::getModel('stores/rest');
|
| 43 |
-
$response = $rest->createTempCart(
|
| 44 |
"storeId" =>Mage::getStoreConfig('iglobal_integration/apireqs/iglobalid'),
|
| 45 |
-
"items" => $items,
|
| 46 |
return $response->tempCartUUID;
|
| 47 |
}
|
| 48 |
}
|
| 49 |
-
?>
|
| 14 |
$product = $item->getProduct();
|
| 15 |
$sku = $item->getSku();
|
| 16 |
$dimUnits = $product->getIgDemesionUnits();
|
| 17 |
+
$dim2inch = array('cm' => 2.54, 'in' => 1, '' => 1);
|
| 18 |
$weight = $product->getIgWeight();
|
| 19 |
if (empty($weight))
|
| 20 |
{
|
| 21 |
$weight = $item->getWeight();
|
| 22 |
}
|
| 23 |
|
| 24 |
+
$items[] = array(
|
| 25 |
"description" => $item->getName(),
|
| 26 |
"productId" => $item->getProductId(),
|
| 27 |
"sku" => $product->getTypeId() == 'bundle' ? substr($sku, strpos($sku, '-') + 1) : $sku,
|
| 36 |
"imageURL" => str_replace("http:", "https:", Mage::helper('catalog/image')->init($product, 'thumbnail')),
|
| 37 |
"itemDescriptionLong" => $product->getDescription(),
|
| 38 |
|
| 39 |
+
);
|
| 40 |
}
|
| 41 |
|
| 42 |
$rest = Mage::getModel('stores/rest');
|
| 43 |
+
$response = $rest->createTempCart(array(
|
| 44 |
"storeId" =>Mage::getStoreConfig('iglobal_integration/apireqs/iglobalid'),
|
| 45 |
+
"items" => $items,));
|
| 46 |
return $response->tempCartUUID;
|
| 47 |
}
|
| 48 |
}
|
|
|
app/code/community/Iglobal/Stores/Model/Observer.php
CHANGED
|
@@ -11,7 +11,7 @@ class Iglobal_Stores_Model_Observer
|
|
| 11 |
{
|
| 12 |
public function __construct()
|
| 13 |
{
|
| 14 |
-
//Just
|
| 15 |
}
|
| 16 |
|
| 17 |
|
|
@@ -119,9 +119,9 @@ class Iglobal_Stores_Model_Observer
|
|
| 119 |
if (count($missedOrders) > 0) {
|
| 120 |
//build email to send
|
| 121 |
if (count($missedOrders) == 1) {
|
| 122 |
-
$body = '<div style=" border-top: 5px solid #88d600; border-bottom: 5px solid #88d600;"><div style="background-color: #ebebea; position: relative; height: 80px; border-bottom: 2px solid #414c50; padding: 15px;"><a style="float: left;" href="https://account.iglobalstores.com"><img src="https://checkout.iglobalstores.com/images/iglobal-exports.png" alt="iGlobal Stores Logo" /></a><h2 style="font-family: arial,sans-serif; color: #414c50; padding-left: 20px; text-align: left;float: left;font-size: 28px;">You\'ve Got An Order!</h2></div><div style="clear: both; padding: 20px; font-family: arial,sans-serif; color: #414c50;"><p>It looks like you\'ve received an
|
| 123 |
} else {
|
| 124 |
-
$body = '<div style=" border-top: 5px solid #88d600; border-bottom: 5px solid #88d600;"><div style="background-color: #ebebea; position: relative; height: 80px; border-bottom: 2px solid #414c50; padding: 15px;"><a style="float: left;" href="https://account.iglobalstores.com"><img src="https://checkout.iglobalstores.com/images/iglobal-exports.png" alt="iGlobal Stores Logo" /></a><h2 style="font-family: arial,sans-serif; color: #414c50; padding-left: 20px; text-align: left;float: left;font-size: 28px;">You\'ve Got Orders!</h2></div><div style="clear: both; padding: 20px; font-family: arial,sans-serif; color: #414c50;"><p>It looks like you\'ve received some
|
| 125 |
}
|
| 126 |
$mail = Mage::getModel('core/email');
|
| 127 |
$mail->setToName('iGlobal Customer');
|
| 11 |
{
|
| 12 |
public function __construct()
|
| 13 |
{
|
| 14 |
+
//Just constructor for fun
|
| 15 |
}
|
| 16 |
|
| 17 |
|
| 119 |
if (count($missedOrders) > 0) {
|
| 120 |
//build email to send
|
| 121 |
if (count($missedOrders) == 1) {
|
| 122 |
+
$body = '<div style=" border-top: 5px solid #88d600; border-bottom: 5px solid #88d600;"><div style="background-color: #ebebea; position: relative; height: 80px; border-bottom: 2px solid #414c50; padding: 15px;"><a style="float: left;" href="https://account.iglobalstores.com"><img src="https://checkout.iglobalstores.com/images/iglobal-exports.png" alt="iGlobal Stores Logo" /></a><h2 style="font-family: arial,sans-serif; color: #414c50; padding-left: 20px; text-align: left;float: left;font-size: 28px;">You\'ve Got An Order!</h2></div><div style="clear: both; padding: 20px; font-family: arial,sans-serif; color: #414c50;"><p>It looks like you\'ve received an international order but it weren\'t successfully imported into your system. The following iGlobal Stores order failed to import:</p><ul style="color: black;"> <li>' . join('</li><li>', $missedOrders) . '</li></ul><p>We recommend that you review the orders and enter them manually. These orders have already been paid for. You can always <a href="http://www.iglobalstores.com/contact-us.html">contact us</a> with any questions. Thanks!</p><p>Sincerely,<br />The iGlobal Stores team</p></div></div>';
|
| 123 |
} else {
|
| 124 |
+
$body = '<div style=" border-top: 5px solid #88d600; border-bottom: 5px solid #88d600;"><div style="background-color: #ebebea; position: relative; height: 80px; border-bottom: 2px solid #414c50; padding: 15px;"><a style="float: left;" href="https://account.iglobalstores.com"><img src="https://checkout.iglobalstores.com/images/iglobal-exports.png" alt="iGlobal Stores Logo" /></a><h2 style="font-family: arial,sans-serif; color: #414c50; padding-left: 20px; text-align: left;float: left;font-size: 28px;">You\'ve Got Orders!</h2></div><div style="clear: both; padding: 20px; font-family: arial,sans-serif; color: #414c50;"><p>It looks like you\'ve received some international orders but they weren\'t successfully imported into your system. The following iGlobal Stores orders failed to import:</p><ul style="color: black;"> <li>' . join('</li><li>', $missedOrders) . '</li></ul><p>We recommend that you review the orders and enter them manually. These orders have already been paid for. You can always <a href="http://www.iglobalstores.com/contact-us.html">contact us</a> with any questions. Thanks!</p><p>Sincerely,<br />The iGlobal Stores team</p></div></div>';
|
| 125 |
}
|
| 126 |
$mail = Mage::getModel('core/email');
|
| 127 |
$mail->setToName('iGlobal Customer');
|
app/code/community/Iglobal/Stores/Model/Order.php
CHANGED
|
@@ -55,14 +55,14 @@ class Iglobal_Stores_Model_Order extends Mage_Core_Model_Abstract
|
|
| 55 |
$this->iglobal_order->countryCode,
|
| 56 |
$this->iglobal_order->state,
|
| 57 |
$this->iglobal_order_id);
|
| 58 |
-
$region->load($regionId);
|
| 59 |
if (!$region->getId())
|
| 60 |
{
|
| 61 |
// Create a new region
|
| 62 |
-
$region->setData(
|
| 63 |
'country_id' => $this->iglobal_order->countryCode,
|
| 64 |
'defalt_name' => $this->iglobal_order->state
|
| 65 |
-
|
| 66 |
|
| 67 |
}
|
| 68 |
}
|
|
@@ -130,40 +130,40 @@ class Iglobal_Stores_Model_Order extends Mage_Core_Model_Abstract
|
|
| 130 |
protected function setShipping($shippingAddress)
|
| 131 |
{
|
| 132 |
//Figure out shipping carrier name etc.
|
| 133 |
-
$shippers =
|
| 134 |
-
'DHL_EXPRESS' =>
|
| 135 |
-
'DHL_GLOBAL_MAIL'=>
|
| 136 |
-
'FEDEX_ECONOMY'=>
|
| 137 |
-
'FEDEX_GROUND'=>
|
| 138 |
-
'FEDEX_PRIORITY'=>
|
| 139 |
-
'UPS_EXPEDITED'=>
|
| 140 |
-
'UPS_EXPRESS'=>
|
| 141 |
-
'UPS_EXPRESS_SAVER' =>
|
| 142 |
-
'UPS_GROUND' =>
|
| 143 |
-
'UPS_STANDARD'=>
|
| 144 |
-
'USPS_FIRST_CLASS_MAIL_INTERNATIONAL'=>
|
| 145 |
-
'USPS_PRIORITY_MAIL_EXPRESS_INTERNATIONAL'=>
|
| 146 |
-
'USPS_PRIORITY_MAIL_INTERNATIONAL'=>
|
| 147 |
-
'APC_EXPEDITED_MAIL'=>
|
| 148 |
-
'APC_PRIORITY_MAIL'=>
|
| 149 |
-
'CANADA_POST_EXPEDITED'=>
|
| 150 |
-
'FEDEX_IPD'=>
|
| 151 |
-
'UPS_2ND_DAY_AIR'=>
|
| 152 |
-
'UPS_3_DAY_AIR'=>
|
| 153 |
-
'UPS_FREIGHT'=>
|
| 154 |
-
'UPS_MAIL_INNOVATIONS'=>
|
| 155 |
-
'UPS_NEXT_DAY_AIR_SAVER'=>
|
| 156 |
-
'UPS_WORLDEASE'=>
|
| 157 |
-
'USPS_EPACKET'=>
|
| 158 |
-
'USPS_EXPRESS_1'=>
|
| 159 |
-
'USPS_IPA'=>
|
| 160 |
-
'LANDMARK_LGINTREGU' =>
|
| 161 |
-
'LANDMARK_LGINTSTD' =>
|
| 162 |
-
'LANDMARK_LGINTSTDU' =>
|
| 163 |
-
'MSI_PARCEL' =>
|
| 164 |
-
'MSI_PRIORITY' =>
|
| 165 |
-
'default' =>
|
| 166 |
-
|
| 167 |
$carrierMethod = $this->iglobal_order->shippingCarrierServiceLevel;
|
| 168 |
if (!isset($shippers[$carrierMethod]))
|
| 169 |
{
|
|
@@ -213,7 +213,7 @@ class Iglobal_Stores_Model_Order extends Mage_Core_Model_Abstract
|
|
| 213 |
|
| 214 |
$id = $order->getEntityId();
|
| 215 |
|
| 216 |
-
if (!Mage::helper('sales')->canSendNewOrderEmail(
|
| 217 |
$order->sendNewOrderEmail();
|
| 218 |
}
|
| 219 |
Mage::getSingleton('checkout/session')->setLastOrderId($order->getId());
|
| 55 |
$this->iglobal_order->countryCode,
|
| 56 |
$this->iglobal_order->state,
|
| 57 |
$this->iglobal_order_id);
|
| 58 |
+
$region->load($regionId->magentoRegionId);
|
| 59 |
if (!$region->getId())
|
| 60 |
{
|
| 61 |
// Create a new region
|
| 62 |
+
$region->setData(array(
|
| 63 |
'country_id' => $this->iglobal_order->countryCode,
|
| 64 |
'defalt_name' => $this->iglobal_order->state
|
| 65 |
+
))->save();
|
| 66 |
|
| 67 |
}
|
| 68 |
}
|
| 130 |
protected function setShipping($shippingAddress)
|
| 131 |
{
|
| 132 |
//Figure out shipping carrier name etc.
|
| 133 |
+
$shippers = array(
|
| 134 |
+
'DHL_EXPRESS' => array('DHL', 'Express - iGlobal'),
|
| 135 |
+
'DHL_GLOBAL_MAIL'=> array('DHL', 'Global Mail - iGlobal'),
|
| 136 |
+
'FEDEX_ECONOMY'=> array('FedExl', 'Economy - iGlobal'),
|
| 137 |
+
'FEDEX_GROUND'=> array('FedEx', 'Ground - iGlobal'),
|
| 138 |
+
'FEDEX_PRIORITY'=> array('FedEx', 'Priority - iGlobal'),
|
| 139 |
+
'UPS_EXPEDITED'=> array('UPS', 'Expedited - iGlobal'),
|
| 140 |
+
'UPS_EXPRESS'=> array('UPS', 'Express - iGlobal'),
|
| 141 |
+
'UPS_EXPRESS_SAVER' => array('UPS', 'Express Saver - iGlobal'),
|
| 142 |
+
'UPS_GROUND' => array('UPS', 'Canada Ground - iGlobal'),
|
| 143 |
+
'UPS_STANDARD'=> array('UPS', 'Canada Standard - iGlobal'),
|
| 144 |
+
'USPS_FIRST_CLASS_MAIL_INTERNATIONAL'=> array('USPS', 'First Class Mail, International - iGlobal'),
|
| 145 |
+
'USPS_PRIORITY_MAIL_EXPRESS_INTERNATIONAL'=> array('USPS', 'Priority Mail Express, International - iGlobal'),
|
| 146 |
+
'USPS_PRIORITY_MAIL_INTERNATIONAL'=> array('USPS', 'Priority Mail, International - iGlobal'),
|
| 147 |
+
'APC_EXPEDITED_MAIL'=> array('UPS', 'APC Expedited 3-5 Days - iGlobal'),
|
| 148 |
+
'APC_PRIORITY_MAIL'=> array('UPS', 'APC Priority Mail 4-9 Days - iGlobal'),
|
| 149 |
+
'CANADA_POST_EXPEDITED'=> array('UPS', 'Canada Post Expedited - iGlobal'),
|
| 150 |
+
'FEDEX_IPD'=> array('UPS', 'FedEx IPD - iGlobal'),
|
| 151 |
+
'UPS_2ND_DAY_AIR'=> array('UPS', 'UPS 2 Day Air - iGlobal'),
|
| 152 |
+
'UPS_3_DAY_AIR'=> array('UPS', 'UPS 3 Day Air - iGlobal'),
|
| 153 |
+
'UPS_FREIGHT'=> array('UPS', 'UPS Freight - iGlobal'),
|
| 154 |
+
'UPS_MAIL_INNOVATIONS'=> array('UPS', 'Bodyguardz - UPS Mail Innovations - iGlobal'),
|
| 155 |
+
'UPS_NEXT_DAY_AIR_SAVER'=>array('UPS', 'UPS Next Day Air Saver - iGlobal'),
|
| 156 |
+
'UPS_WORLDEASE'=> array('UPS', 'UPS WorldEase - iGlobal'),
|
| 157 |
+
'USPS_EPACKET'=> array('UPS', 'USPS ePacket - iGlobal'),
|
| 158 |
+
'USPS_EXPRESS_1'=> array('UPS', 'Express 1 Mail - iGlobal'),
|
| 159 |
+
'USPS_IPA'=> array('UPS', 'USPS IPA - iGlobal'),
|
| 160 |
+
'LANDMARK_LGINTREGU' => array('iGlobal', 'Landmark'),
|
| 161 |
+
'LANDMARK_LGINTSTD' => array('iGlobal', 'Landmark'),
|
| 162 |
+
'LANDMARK_LGINTSTDU' => array('iGlobal', 'Landmark'),
|
| 163 |
+
'MSI_PARCEL' => array('iGlobal', 'Landmark'),
|
| 164 |
+
'MSI_PRIORITY' => array('iGlobal', 'Landmark'),
|
| 165 |
+
'default' => array('iGlobal', 'International Shipping'),
|
| 166 |
+
);
|
| 167 |
$carrierMethod = $this->iglobal_order->shippingCarrierServiceLevel;
|
| 168 |
if (!isset($shippers[$carrierMethod]))
|
| 169 |
{
|
| 213 |
|
| 214 |
$id = $order->getEntityId();
|
| 215 |
|
| 216 |
+
if (!Mage::helper('sales')->canSendNewOrderEmail() && Mage::getStoreConfig('iglobal_integration/apireqs/send_order_email')) {
|
| 217 |
$order->sendNewOrderEmail();
|
| 218 |
}
|
| 219 |
Mage::getSingleton('checkout/session')->setLastOrderId($order->getId());
|
app/code/community/Iglobal/Stores/Model/Resource/Setup.php
CHANGED
|
@@ -157,6 +157,4 @@ class Iglobal_Stores_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup
|
|
| 157 |
|
| 158 |
return $id;
|
| 159 |
}
|
| 160 |
-
}
|
| 161 |
-
|
| 162 |
-
?>
|
| 157 |
|
| 158 |
return $id;
|
| 159 |
}
|
| 160 |
+
}
|
|
|
|
|
|
app/code/community/Iglobal/Stores/Model/Rest.php
CHANGED
|
@@ -69,7 +69,7 @@ class Iglobal_Stores_Model_Rest extends Mage_Core_Model_Abstract
|
|
| 69 |
return $this->callApi(
|
| 70 |
'magento-region',
|
| 71 |
$data,
|
| 72 |
-
|
| 73 |
);
|
| 74 |
}
|
| 75 |
}
|
| 69 |
return $this->callApi(
|
| 70 |
'magento-region',
|
| 71 |
$data,
|
| 72 |
+
array("serviceToken" => "31ae7155-5b9e-461f-8353-9a8c3f8ae35974ffec3a-88dc-4acb-8420-270df7967338")
|
| 73 |
);
|
| 74 |
}
|
| 75 |
}
|
app/code/community/Iglobal/Stores/controllers/CheckoutController.php
CHANGED
|
@@ -26,7 +26,7 @@ class Iglobal_Stores_CheckoutController extends Mage_Core_Controller_Front_Actio
|
|
| 26 |
$cartId = $tempcart->getTempCartId();
|
| 27 |
|
| 28 |
// echo out the html that will build the iframe
|
| 29 |
-
$domCode = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>International Checkout</title> <style type="text/css"> body, html {margin: 0; padding: 0; height: 100%; overflow: hidden;} #content{position:absolute; left: 0; right: 0; bottom: 0; top:
|
| 30 |
//this is where we build the url for the checkout
|
| 31 |
$subdomain = (Mage::getStoreConfig('iglobal_integration/apireqs/igsubdomain') ? Mage::getStoreConfig('iglobal_integration/apireqs/igsubdomain') : "checkout");
|
| 32 |
$storeNumber = (Mage::getStoreConfig('iglobal_integration/apireqs/iglobalid') ? Mage::getStoreConfig('iglobal_integration/apireqs/iglobalid') : "3");
|
| 26 |
$cartId = $tempcart->getTempCartId();
|
| 27 |
|
| 28 |
// echo out the html that will build the iframe
|
| 29 |
+
$domCode = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>International Checkout</title> <style type="text/css"> body, html {margin: 0; padding: 0; height: 100%; overflow: hidden;} #content{position:absolute; left: 0; right: 0; bottom: 0; top: 0;} </style></head><body><div id="content"><iframe width="100%" height="100%" frameborder="0" src="';
|
| 30 |
//this is where we build the url for the checkout
|
| 31 |
$subdomain = (Mage::getStoreConfig('iglobal_integration/apireqs/igsubdomain') ? Mage::getStoreConfig('iglobal_integration/apireqs/igsubdomain') : "checkout");
|
| 32 |
$storeNumber = (Mage::getStoreConfig('iglobal_integration/apireqs/iglobalid') ? Mage::getStoreConfig('iglobal_integration/apireqs/iglobalid') : "3");
|
app/code/community/Iglobal/Stores/etc/adminhtml.xml
CHANGED
|
@@ -22,7 +22,7 @@
|
|
| 22 |
<title>iGlobal Stores Integration Options</title>
|
| 23 |
</iglobal_integration>
|
| 24 |
<jquery translate="title">
|
| 25 |
-
<title>jQuery
|
| 26 |
</jquery>
|
| 27 |
</children>
|
| 28 |
</config>
|
| 22 |
<title>iGlobal Stores Integration Options</title>
|
| 23 |
</iglobal_integration>
|
| 24 |
<jquery translate="title">
|
| 25 |
+
<title>jQuery Library</title>
|
| 26 |
</jquery>
|
| 27 |
</children>
|
| 28 |
</config>
|
app/design/frontend/base/default/template/iglobal/checkout/onepage/link.phtml
CHANGED
|
@@ -25,6 +25,6 @@
|
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php if ($this->isPossibleOnepageCheckout()):?>
|
| 28 |
-
<button type="button" title="<?php echo $this->__('Proceed to Checkout') ?>" class="button btn-proceed-checkout btn-checkout<?php if ($this->isDisabled()):?> no-checkout<?php endif; ?>"<?php if ($this->isDisabled()):?> disabled="disabled"<?php endif; ?> onclick="<?php echo $this->getCheckoutUrl()
|
| 29 |
<?php endif?>
|
| 30 |
|
| 25 |
*/
|
| 26 |
?>
|
| 27 |
<?php if ($this->isPossibleOnepageCheckout()):?>
|
| 28 |
+
<button type="button" title="<?php echo $this->__('Proceed to Checkout') ?>" class="button btn-proceed-checkout btn-checkout<?php if ($this->isDisabled()):?> no-checkout<?php endif; ?>"<?php if ($this->isDisabled()):?> disabled="disabled"<?php endif; ?> onclick="<?php echo $this->getCheckoutUrl() ?>"><span><span><?php echo $this->__('Proceed to Checkout') ?></span></span></button>
|
| 29 |
<?php endif?>
|
| 30 |
|
app/design/frontend/base/default/template/iglobal/stores/cart.phtml
CHANGED
|
@@ -271,4 +271,3 @@
|
|
| 271 |
}
|
| 272 |
|
| 273 |
echo '</div><!--end igItemAttr-->';
|
| 274 |
-
?>
|
| 271 |
}
|
| 272 |
|
| 273 |
echo '</div><!--end igItemAttr-->';
|
|
|
app/design/frontend/base/default/template/iglobal/stores/igcincludes.phtml
CHANGED
|
@@ -36,7 +36,7 @@
|
|
| 36 |
|
| 37 |
} else {
|
| 38 |
//welcome mat is off
|
| 39 |
-
echo '<span id="welcome_mat_deactivated"
|
| 40 |
}
|
| 41 |
|
| 42 |
//set includes for ICE and main
|
|
@@ -55,4 +55,3 @@
|
|
| 55 |
}
|
| 56 |
|
| 57 |
echo '<!--End of iGlobal-->';
|
| 58 |
-
?>
|
| 36 |
|
| 37 |
} else {
|
| 38 |
//welcome mat is off
|
| 39 |
+
echo '<span id="welcome_mat_deactivated" style="display: none;"></span>';
|
| 40 |
}
|
| 41 |
|
| 42 |
//set includes for ICE and main
|
| 55 |
}
|
| 56 |
|
| 57 |
echo '<!--End of iGlobal-->';
|
|
|
package.xml
CHANGED
|
@@ -1,12 +1,14 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Iglobal_Main</name>
|
| 4 |
-
<version>1.2.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>OSL</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
-
<summary
|
|
|
|
|
|
|
| 10 |
<description>International eCommerce Done Right
|
| 11 |
Thanks for checking out the iGlobal Stores extension for Magento Community Edition! This extension gives you access to the many features of iGlobal Stores services. For more information on this extension and iGlobal's services, please visit http://www.iglobalstores.com/magento
|
| 12 |

|
|
@@ -36,9 +38,9 @@ Faster Speeds
|
|
| 36 |
Country Region Fixes
|
| 37 |
iGlobal Stores Updated API</notes>
|
| 38 |
<authors><author><name>Matt Flamm</name><user>mattflamm</user><email>matt@iglobalstores.com</email></author></authors>
|
| 39 |
-
<date>2015-09-
|
| 40 |
-
<time>
|
| 41 |
-
<contents><target name="mageetc"><dir name="modules"><file name="Iglobal_Stores.xml" hash="56839ad045b6a99f97564de63ebed700"/><file name="Iglobal_Ship.xml" hash="6d40f1c84e29bb7d8b70eadd77a03917"/></dir></target><target name="magecommunity"><dir name="Iglobal"><dir name="Ship"><dir name="Block"><file name="Ship.php" hash="a802b4d42e72997ec4ab466dec75b743"/></dir><dir name="Helper"><file name="Data.php" hash="fe9f074c1cb74260fa134efa94eb67c9"/></dir><dir name="Model"><dir name="Carrier"><file name="Excellence.php" hash="
|
| 42 |
<compatible/>
|
| 43 |
<dependencies><required><php><min>5.0.0</min><max>7.0.7</max></php></required></dependencies>
|
| 44 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Iglobal_Main</name>
|
| 4 |
+
<version>1.2.1</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>OSL</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
+
<summary>-Code improved for faster loading
|
| 10 |
+
-Improved Logging
|
| 11 |
+
-Improved Tax Integration</summary>
|
| 12 |
<description>International eCommerce Done Right
|
| 13 |
Thanks for checking out the iGlobal Stores extension for Magento Community Edition! This extension gives you access to the many features of iGlobal Stores services. For more information on this extension and iGlobal's services, please visit http://www.iglobalstores.com/magento
|
| 14 |

|
| 38 |
Country Region Fixes
|
| 39 |
iGlobal Stores Updated API</notes>
|
| 40 |
<authors><author><name>Matt Flamm</name><user>mattflamm</user><email>matt@iglobalstores.com</email></author></authors>
|
| 41 |
+
<date>2015-09-22</date>
|
| 42 |
+
<time>15:20:34</time>
|
| 43 |
+
<contents><target name="mageetc"><dir name="modules"><file name="Iglobal_Stores.xml" hash="56839ad045b6a99f97564de63ebed700"/><file name="Iglobal_Ship.xml" hash="6d40f1c84e29bb7d8b70eadd77a03917"/></dir></target><target name="magecommunity"><dir name="Iglobal"><dir name="Ship"><dir name="Block"><file name="Ship.php" hash="a802b4d42e72997ec4ab466dec75b743"/></dir><dir name="Helper"><file name="Data.php" hash="fe9f074c1cb74260fa134efa94eb67c9"/></dir><dir name="Model"><dir name="Carrier"><file name="Excellence.php" hash="d1814260e342346b74d7ff3543499d4f"/></dir></dir><dir name="controllers"><file name="IndexController.php" hash="3355a75caf30f4ff96499da3d8a4102a"/></dir><dir name="etc"><file name="config.xml" hash="adecbc76332ffb4b0f8918d3166c655c"/><file name="system.xml" hash="fea6b2ed9b7fdf5748cb57e53fe1301b"/></dir></dir><dir name="Stores"><dir name="Block"><file name="Ajax.php" hash="5d288c6bc298db3bdc86adcdd036bdd6"/><file name="Cart.php" hash="a162e67a8c445b911dd25897e4d886a3"/><file name="Includes.php" hash="8214ef5eae6a83e2909f8ebeee6ea1f7"/><file name="Link.php" hash="e3fa83ebece58a1c869ac8aa001536ec"/></dir><dir name="Helper"><file name="Configoptions.php" hash="b129e55b21f845a20d6e7fdb3b532be3"/><file name="Data.php" hash="3cb8b1a1c1fe86e703c6ffd6763c66a0"/><file name="Url.php" hash="89bd9bbc4628dd545c72f19db69a7dd8"/></dir><dir name="Model"><file name="Configoptions.php" hash="56a5c17a3e71079ecf574fd4a0e69011"/><dir name="International"><file name="International.php" hash="434d2dd1052de9023db149e05673cb8b"/></dir><file name="Observer.php" hash="c55e17df0bb21fcc916bac2874e52fec"/><file name="Order.php" hash="0bbd2db7ec80fdec8260864538f74f46"/><dir name="Payment"><file name="Iglobal.php" hash="9ac8f8d81b8f8d547831ad6db8a1c7fc"/><file name="Iglobalcreditcard.php" hash="f2f5cf4507a128fadc95071951ca2a41"/><file name="Iglobalpaypal.php" hash="3a566289db82b177ce6b52ce205728f6"/></dir><dir name="Resource"><file name="Setup.php" hash="f725924af461644af75a455210097a53"/></dir><file name="Rest.php" hash="0b3fd2a4bffc0a4a5e8aca28ad3fce5f"/><dir name="Sales"><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Fee.php" hash="433e135f082364766ca14e0f8694e741"/></dir></dir></dir></dir><dir name="Service"><file name="Quote.php" hash="bae0e5a710b9e3aa1427bb78a08fbfd8"/></dir></dir><dir name="controllers"><file name="AjaxController.php" hash="3169062e850efd55749ae8033676bf2d"/><file name="CheckoutController.php" hash="f4b9b2cf1441b3efa30473cc602b4a77"/><file name="SuccessController.php" hash="4e5dbc1bf261cd9e536fb8cc6f4d4b87"/></dir><dir name="etc"><file name="adminhtml.xml" hash="7f10c9724b1294a506df47cf569bc9e6"/><file name="config.xml" hash="4f52d0e71c5566132d6f762d522d3918"/><file name="system.xml" hash="41142f308c4189f5b8cc17ab1730823b"/></dir><dir name="sql"><dir name="iglobal_stores_setup"><file name="mysql4-install-0.1.0.php" hash="72c543090fe27608e582d22494b65d75"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="51e83dd266d7b232d42f03cac66350df"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="4dc024ad63d7a7ea20697ddef4b60a29"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="51e83dd266d7b232d42f03cac66350df"/><file name="mysql4-upgrade-0.1.3-1.0.0.php" hash="829b7c08d5bce22b5c1750a3d72e21ca"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="iglobal.xml" hash="6df6f5f0aceab891d0cd13061a3b5e55"/></dir><dir name="template"><dir name="iglobal"><dir name="sales"><dir name="order"><dir name="view"><file name="info.phtml" hash="06280040dd9521efcd36c12779648108"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="iglobal.xml" hash="d49680762997b0480aaaeae331dc4695"/></dir><dir name="template"><dir name="iglobal"><dir name="checkout"><dir name="cart"><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="9eaac8c650b6986db7c0a5005966c4ee"/></dir></dir></dir><dir name="onepage"><file name="link.phtml" hash="12a68b6580f9441bc0400b72c66b8358"/></dir></dir><dir name="stores"><file name="cart.phtml" hash="d2188a71fb45d4a5fba006b8748cf7b7"/><file name="igcincludes.phtml" hash="43f0bf839553fce75626ee5fa822260d"/></dir></dir></dir></dir></dir></dir></target></contents>
|
| 44 |
<compatible/>
|
| 45 |
<dependencies><required><php><min>5.0.0</min><max>7.0.7</max></php></required></dependencies>
|
| 46 |
</package>
|
