Version Notes
Ship2MyId Magento Extension Stable Module.
Download this release
Release Info
| Developer | MapMyId Inc. |
| Extension | Ship2MyID |
| Version | 1.4.1 |
| Comparing to | |
| See all releases | |
Code changes from version 1.4.0 to 1.4.1
- app/code/local/Xclm24/Checkout/etc/config.xml +1 -1
- app/code/local/Xclm24/Myidshipping/Helper/Data.php +2 -2
- app/code/local/Xclm24/Myidshipping/Model/Cron.php +7 -4
- app/code/local/Xclm24/Myidshipping/Model/Order.php +9 -2
- app/code/local/Xclm24/Myidshipping/etc/config.xml +2 -2
- app/code/local/Xclm24/Myidshipping/sql/myidshipping_setup/install-1.0.php +1 -1
- app/code/local/Xclm24/Myidshipping/sql/myidshipping_setup/upgrade-1.0-1.1.php +4 -1
- app/code/local/Xclm24/Myidshipping/sql/myidshipping_setup/upgrade-1.1-1.2.php +4 -4
- app/code/local/Xclm24/Myidshipping/sql/myidshipping_setup/upgrade-1.2-1.3.php +1 -1
- app/code/local/Xclm24/Myidshipping/sql/myidshipping_setup/upgrade-1.3-1.4.php +0 -16
- app/design/adminhtml/default/default/template/myidshipping/sales/order/view/info.phtml +26 -9
- app/design/frontend/base/default/template/myidshipping/myidshipping.phtml +1 -1
- app/design/frontend/base/default/template/myidshipping/sales/order/info.phtml +8 -8
- app/locale/en_US/template/email/sales/clm24/creditmemo_new.html +3 -3
- app/locale/en_US/template/email/sales/clm24/creditmemo_new_guest.html +3 -3
- app/locale/en_US/template/email/sales/clm24/invoice_new.html +3 -3
- app/locale/en_US/template/email/sales/clm24/invoice_new_guest.html +3 -3
- app/locale/en_US/template/email/sales/clm24/shipment_new.html +3 -3
- app/locale/en_US/template/email/sales/clm24/shipment_new_guest.html +3 -3
- package.xml +4 -4
- skin/frontend/base/default/css/myshipping/lightwindow.css +2 -2
- skin/frontend/base/default/images/mapmyid/backgroundlight.png +0 -0
app/code/local/Xclm24/Checkout/etc/config.xml
CHANGED
|
@@ -22,7 +22,7 @@
|
|
| 22 |
<config>
|
| 23 |
<modules>
|
| 24 |
<Xclm24_Checkout>
|
| 25 |
-
<version>1.
|
| 26 |
</Xclm24_Checkout>
|
| 27 |
</modules>
|
| 28 |
|
| 22 |
<config>
|
| 23 |
<modules>
|
| 24 |
<Xclm24_Checkout>
|
| 25 |
+
<version>1.4.1</version>
|
| 26 |
</Xclm24_Checkout>
|
| 27 |
</modules>
|
| 28 |
|
app/code/local/Xclm24/Myidshipping/Helper/Data.php
CHANGED
|
@@ -901,7 +901,7 @@ class Xclm24_Myidshipping_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 901 |
}
|
| 902 |
|
| 903 |
if (isset($region_name) && $region_name != "") {
|
| 904 |
-
$query = "SELECT region_id FROM directory_country_region_name WHERE name ='" . $region_name . "'";
|
| 905 |
$regionid = $readConnection->fetchOne($query);
|
| 906 |
if (isset($regionid) && $regionid != "") {
|
| 907 |
$region_id = $regionid;
|
|
@@ -909,7 +909,7 @@ class Xclm24_Myidshipping_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 909 |
$region_name = $region_name;
|
| 910 |
}
|
| 911 |
} elseif (isset($data['region']) && $data['region'] != "") {
|
| 912 |
-
$query = "SELECT region_id FROM directory_country_region_name WHERE name ='" . $data['region'] . "'";
|
| 913 |
$regionid = $readConnection->fetchOne($query);
|
| 914 |
if (isset($regionid) && $regionid != "") {
|
| 915 |
$region_id = $regionid;
|
| 901 |
}
|
| 902 |
|
| 903 |
if (isset($region_name) && $region_name != "") {
|
| 904 |
+
$query = "SELECT region_id FROM `".$resource->getTableName('directory_country_region_name')."` WHERE name ='" . $region_name . "'";
|
| 905 |
$regionid = $readConnection->fetchOne($query);
|
| 906 |
if (isset($regionid) && $regionid != "") {
|
| 907 |
$region_id = $regionid;
|
| 909 |
$region_name = $region_name;
|
| 910 |
}
|
| 911 |
} elseif (isset($data['region']) && $data['region'] != "") {
|
| 912 |
+
$query = "SELECT region_id FROM `".$resource->getTableName('directory_country_region_name')."` WHERE name ='" . $data['region'] . "'";
|
| 913 |
$regionid = $readConnection->fetchOne($query);
|
| 914 |
if (isset($regionid) && $regionid != "") {
|
| 915 |
$region_id = $regionid;
|
app/code/local/Xclm24/Myidshipping/Model/Cron.php
CHANGED
|
@@ -165,7 +165,8 @@ class Xclm24_Myidshipping_Model_Cron extends Mage_Core_Model_Abstract
|
|
| 165 |
$_data = array(
|
| 166 |
"entity_id" => $entityId,
|
| 167 |
"order_status_id" => $_order_status_id,
|
| 168 |
-
|
|
|
|
| 169 |
"updated_at" => date('Y-m-d H:i:s')
|
| 170 |
);
|
| 171 |
|
|
@@ -334,7 +335,8 @@ class Xclm24_Myidshipping_Model_Cron extends Mage_Core_Model_Abstract
|
|
| 334 |
$_data = array(
|
| 335 |
"entity_id" => $entityId,
|
| 336 |
"order_status_id" => $_order_status_id,
|
| 337 |
-
|
|
|
|
| 338 |
"updated_at" => date('Y-m-d H:i:s')
|
| 339 |
);
|
| 340 |
|
|
@@ -363,7 +365,7 @@ class Xclm24_Myidshipping_Model_Cron extends Mage_Core_Model_Abstract
|
|
| 363 |
$realorderId = $_rej_order['real_order_id'];
|
| 364 |
if (!empty($realorderId)) {
|
| 365 |
$_order_status_id = 2;
|
| 366 |
-
$order = Mage::getModel('sales/order')
|
| 367 |
->getCollection()
|
| 368 |
->addAttributeToFilter('state', array('neq' => Mage_Sales_Model_Order::STATE_CANCELED))
|
| 369 |
->addAttributeToFilter('increment_id', $orderId)
|
|
@@ -380,7 +382,8 @@ class Xclm24_Myidshipping_Model_Cron extends Mage_Core_Model_Abstract
|
|
| 380 |
$_data = array(
|
| 381 |
"entity_id" => $entityId,
|
| 382 |
"order_status_id" => $_order_status_id,
|
| 383 |
-
|
|
|
|
| 384 |
"updated_at" => date('Y-m-d H:i:s')
|
| 385 |
);
|
| 386 |
|
| 165 |
$_data = array(
|
| 166 |
"entity_id" => $entityId,
|
| 167 |
"order_status_id" => $_order_status_id,
|
| 168 |
+
"r_name"=> $_clm24Order["receiver_first_name"].' '.$_clm24Order["receiver_last_name"],
|
| 169 |
+
"r_telephone"=> $tele,
|
| 170 |
"updated_at" => date('Y-m-d H:i:s')
|
| 171 |
);
|
| 172 |
|
| 335 |
$_data = array(
|
| 336 |
"entity_id" => $entityId,
|
| 337 |
"order_status_id" => $_order_status_id,
|
| 338 |
+
"r_name"=> $_clm24Order["receiver_first_name"].' '.$_clm24Order["receiver_last_name"],
|
| 339 |
+
"r_telephone"=> $tele,
|
| 340 |
"updated_at" => date('Y-m-d H:i:s')
|
| 341 |
);
|
| 342 |
|
| 365 |
$realorderId = $_rej_order['real_order_id'];
|
| 366 |
if (!empty($realorderId)) {
|
| 367 |
$_order_status_id = 2;
|
| 368 |
+
$order = Mage::getModel('sales/order')
|
| 369 |
->getCollection()
|
| 370 |
->addAttributeToFilter('state', array('neq' => Mage_Sales_Model_Order::STATE_CANCELED))
|
| 371 |
->addAttributeToFilter('increment_id', $orderId)
|
| 382 |
$_data = array(
|
| 383 |
"entity_id" => $entityId,
|
| 384 |
"order_status_id" => $_order_status_id,
|
| 385 |
+
//"r_name"=> $_clm24Order["receiver_first_name"].' '.$_clm24Order["receiver_last_name"],
|
| 386 |
+
///"r_telephone"=> $tele,
|
| 387 |
"updated_at" => date('Y-m-d H:i:s')
|
| 388 |
);
|
| 389 |
|
app/code/local/Xclm24/Myidshipping/Model/Order.php
CHANGED
|
@@ -175,12 +175,19 @@ class Xclm24_Myidshipping_Model_Order extends Mage_Sales_Model_Order
|
|
| 175 |
|
| 176 |
$countryName = $countryModel->getName();
|
| 177 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 178 |
$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/ship2myid_label') . "<br>";
|
| 179 |
$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/street_line1') . "<br>";
|
| 180 |
$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/street_line2') . "<br>";
|
| 181 |
$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/city') . "<br>";
|
| 182 |
-
$clm24shipping_address = $clm24shipping_address .
|
| 183 |
-
$clm24shipping_address = $clm24shipping_address .
|
|
|
|
| 184 |
|
| 185 |
$flag_ship2myid = 1;
|
| 186 |
|
| 175 |
|
| 176 |
$countryName = $countryModel->getName();
|
| 177 |
|
| 178 |
+
//$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/ship2myid_label') . "<br>";
|
| 179 |
+
//$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/street_line1') . "<br>";
|
| 180 |
+
//$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/street_line2') . "<br>";
|
| 181 |
+
//$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/city') . "<br>";
|
| 182 |
+
//$clm24shipping_address = $clm24shipping_address . $postcode . "<br>";
|
| 183 |
+
//$clm24shipping_address = $clm24shipping_address . $countryName . "<br>";
|
| 184 |
$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/ship2myid_label') . "<br>";
|
| 185 |
$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/street_line1') . "<br>";
|
| 186 |
$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/street_line2') . "<br>";
|
| 187 |
$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/city') . "<br>";
|
| 188 |
+
$clm24shipping_address = $clm24shipping_address . 'XXXXX' . "<br>";
|
| 189 |
+
$clm24shipping_address = $clm24shipping_address . 'XX' . "<br>";
|
| 190 |
+
|
| 191 |
|
| 192 |
$flag_ship2myid = 1;
|
| 193 |
|
app/code/local/Xclm24/Myidshipping/etc/config.xml
CHANGED
|
@@ -22,7 +22,7 @@
|
|
| 22 |
<config>
|
| 23 |
<modules>
|
| 24 |
<Xclm24_Myidshipping>
|
| 25 |
-
<version>1.4</version>
|
| 26 |
</Xclm24_Myidshipping>
|
| 27 |
</modules>
|
| 28 |
|
|
@@ -298,7 +298,7 @@
|
|
| 298 |
<cron_expr>*/5 * * * *</cron_expr>
|
| 299 |
</schedule>
|
| 300 |
<run>
|
| 301 |
-
<model>myidshipping/cron::
|
| 302 |
</run>
|
| 303 |
</clm24core_scheduler>
|
| 304 |
<clm24core_scheduler_cancel>
|
| 22 |
<config>
|
| 23 |
<modules>
|
| 24 |
<Xclm24_Myidshipping>
|
| 25 |
+
<version>1.4.1</version>
|
| 26 |
</Xclm24_Myidshipping>
|
| 27 |
</modules>
|
| 28 |
|
| 298 |
<cron_expr>*/5 * * * *</cron_expr>
|
| 299 |
</schedule>
|
| 300 |
<run>
|
| 301 |
+
<model>myidshipping/cron::batchscheduler</model>
|
| 302 |
</run>
|
| 303 |
</clm24core_scheduler>
|
| 304 |
<clm24core_scheduler_cancel>
|
app/code/local/Xclm24/Myidshipping/sql/myidshipping_setup/install-1.0.php
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
$installer = $this;
|
| 22 |
/* @var $installer Mage_Core_Model_Resource_Setup */
|
| 23 |
$this->startSetup()->run("
|
| 24 |
-
CREATE TABLE {$this->getTable('clm24_myidshipping')} (
|
| 25 |
`entity_id` int(10) unsigned NOT NULL auto_increment,
|
| 26 |
`order_grid_id` int(10) unsigned NOT NULL COMMENT 'Order grid Id',
|
| 27 |
`attribute` varchar(255) DEFAULT NULL,
|
| 21 |
$installer = $this;
|
| 22 |
/* @var $installer Mage_Core_Model_Resource_Setup */
|
| 23 |
$this->startSetup()->run("
|
| 24 |
+
CREATE TABLE IF NOT EXISTS {$this->getTable('clm24_myidshipping')} (
|
| 25 |
`entity_id` int(10) unsigned NOT NULL auto_increment,
|
| 26 |
`order_grid_id` int(10) unsigned NOT NULL COMMENT 'Order grid Id',
|
| 27 |
`attribute` varchar(255) DEFAULT NULL,
|
app/code/local/Xclm24/Myidshipping/sql/myidshipping_setup/upgrade-1.0-1.1.php
CHANGED
|
@@ -21,13 +21,16 @@
|
|
| 21 |
$installer = $this;
|
| 22 |
/* @var $installer Mage_Core_Model_Resource_Setup */
|
| 23 |
$this->startSetup()->run("
|
| 24 |
-
CREATE TABLE {$this->getTable('clm24_myidshipping_ordergrid')} (
|
| 25 |
`entity_id` int(10) unsigned NOT NULL auto_increment,
|
| 26 |
`order_id` int(10) unsigned NOT NULL COMMENT 'Order Id',
|
| 27 |
`real_order_id` varchar(255) DEFAULT NULL,
|
| 28 |
`order_status_id` int(11) DEFAULT NULL COMMENT '0: Pending, 1: Accepted, 2: Rejected, 3: Completed',
|
| 29 |
`order_group_id` varchar(255) DEFAULT NULL,
|
| 30 |
`max_shipment` int(10) unsigned NOT NULL,
|
|
|
|
|
|
|
|
|
|
| 31 |
`created_at` timestamp NULL DEFAULT NULL COMMENT 'Created At',
|
| 32 |
`updated_at` timestamp NULL DEFAULT NULL COMMENT 'Updated At',
|
| 33 |
PRIMARY KEY (`entity_id`)
|
| 21 |
$installer = $this;
|
| 22 |
/* @var $installer Mage_Core_Model_Resource_Setup */
|
| 23 |
$this->startSetup()->run("
|
| 24 |
+
CREATE TABLE IF NOT EXISTS {$this->getTable('clm24_myidshipping_ordergrid')} (
|
| 25 |
`entity_id` int(10) unsigned NOT NULL auto_increment,
|
| 26 |
`order_id` int(10) unsigned NOT NULL COMMENT 'Order Id',
|
| 27 |
`real_order_id` varchar(255) DEFAULT NULL,
|
| 28 |
`order_status_id` int(11) DEFAULT NULL COMMENT '0: Pending, 1: Accepted, 2: Rejected, 3: Completed',
|
| 29 |
`order_group_id` varchar(255) DEFAULT NULL,
|
| 30 |
`max_shipment` int(10) unsigned NOT NULL,
|
| 31 |
+
`email` VARCHAR( 255 ) NULL DEFAULT NULL,
|
| 32 |
+
`r_name` VARCHAR( 255 ) NULL DEFAULT NULL,
|
| 33 |
+
`r_telephone` VARCHAR( 25 ) NULL DEFAULT NULL,
|
| 34 |
`created_at` timestamp NULL DEFAULT NULL COMMENT 'Created At',
|
| 35 |
`updated_at` timestamp NULL DEFAULT NULL COMMENT 'Updated At',
|
| 36 |
PRIMARY KEY (`entity_id`)
|
app/code/local/Xclm24/Myidshipping/sql/myidshipping_setup/upgrade-1.1-1.2.php
CHANGED
|
@@ -21,12 +21,12 @@
|
|
| 21 |
$installer = $this;
|
| 22 |
/* @var $installer Mage_Core_Model_Resource_Setup */
|
| 23 |
|
| 24 |
-
|
| 25 |
-
|
| 26 |
-
")->endSetup()
|
| 27 |
|
| 28 |
$this->startSetup()->run("
|
| 29 |
-
CREATE TABLE {$this->getTable('clm24_myidshipping')} (
|
| 30 |
`entity_id` int(10) unsigned NOT NULL auto_increment,
|
| 31 |
`order_grid_id` int(10) unsigned NOT NULL COMMENT 'Order grid Id',
|
| 32 |
`attribute` varchar(255) DEFAULT NULL,
|
| 21 |
$installer = $this;
|
| 22 |
/* @var $installer Mage_Core_Model_Resource_Setup */
|
| 23 |
|
| 24 |
+
/*$this->startSetup()->run("
|
| 25 |
+
ALTER TABLE `{$this->getTable('clm24_myidshipping')}` RENAME `{$this->getTable('clm24_myidshipping')}_old` ;
|
| 26 |
+
")->endSetup();*/
|
| 27 |
|
| 28 |
$this->startSetup()->run("
|
| 29 |
+
CREATE TABLE IF NOT EXISTS {$this->getTable('clm24_myidshipping')} (
|
| 30 |
`entity_id` int(10) unsigned NOT NULL auto_increment,
|
| 31 |
`order_grid_id` int(10) unsigned NOT NULL COMMENT 'Order grid Id',
|
| 32 |
`attribute` varchar(255) DEFAULT NULL,
|
app/code/local/Xclm24/Myidshipping/sql/myidshipping_setup/upgrade-1.2-1.3.php
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
$installer = $this;
|
| 22 |
/* @var $installer Mage_Core_Model_Resource_Setup */
|
| 23 |
$this->startSetup()->run("
|
| 24 |
-
CREATE TABLE {$this->getTable('clm24_myidcoupon')} (
|
| 25 |
`entity_id` int(10) unsigned NOT NULL auto_increment,
|
| 26 |
`rule_id` int(10) unsigned NOT NULL COMMENT 'Rule Id fo salesrule',
|
| 27 |
`ship2myid_only` smallint(6) unsigned DEFAULT NULL COMMENT 'For ship2myid only',
|
| 21 |
$installer = $this;
|
| 22 |
/* @var $installer Mage_Core_Model_Resource_Setup */
|
| 23 |
$this->startSetup()->run("
|
| 24 |
+
CREATE TABLE IF NOT EXISTS {$this->getTable('clm24_myidcoupon')} (
|
| 25 |
`entity_id` int(10) unsigned NOT NULL auto_increment,
|
| 26 |
`rule_id` int(10) unsigned NOT NULL COMMENT 'Rule Id fo salesrule',
|
| 27 |
`ship2myid_only` smallint(6) unsigned DEFAULT NULL COMMENT 'For ship2myid only',
|
app/code/local/Xclm24/Myidshipping/sql/myidshipping_setup/upgrade-1.3-1.4.php
DELETED
|
@@ -1,16 +0,0 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
/**
|
| 3 |
-
* Created by JetBrains PhpStorm.
|
| 4 |
-
* User: Kit Lee
|
| 5 |
-
* Date: 21/01/13
|
| 6 |
-
* Time: 11:15 AM
|
| 7 |
-
* To change this template use File | Settings | File Templates.
|
| 8 |
-
*/
|
| 9 |
-
$installer = $this;
|
| 10 |
-
/* @var $installer Mage_Core_Model_Resource_Setup */
|
| 11 |
-
$this->startSetup()->run("
|
| 12 |
-
ALTER TABLE {$this->getTable('clm24_myidshipping_ordergrid')} ADD `email` VARCHAR( 255 ) NULL DEFAULT NULL AFTER `max_shipment` ,
|
| 13 |
-
ADD `r_name` VARCHAR( 255 ) NULL DEFAULT NULL AFTER `email` ,
|
| 14 |
-
ADD `r_telephone` VARCHAR( 25 ) NULL DEFAULT NULL AFTER `r_name`
|
| 15 |
-
")->endSetup();
|
| 16 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/design/adminhtml/default/default/template/myidshipping/sales/order/view/info.phtml
CHANGED
|
@@ -177,26 +177,43 @@ $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium',
|
|
| 177 |
$clm24_model = Mage::getModel("myidshipping/ordergrid");
|
| 178 |
$orderClm24Data = $clm24_model->getCollection()->addFieldToFilter('order_id',$_order->getRealOrderId())->getFirstItem();
|
| 179 |
$orderData = $orderClm24Data->getEntityId();
|
|
|
|
| 180 |
$resource = Mage::getSingleton('core/resource');
|
| 181 |
$readConnection = $resource->getConnection('core_read');
|
| 182 |
$writeConnection = $resource->getConnection('core_write');
|
| 183 |
$table = $resource->getTableName('myidshipping/shipping');
|
| 184 |
-
|
|
|
|
| 185 |
$receivertel = $readConnection->fetchOne($query);
|
| 186 |
$query = "select value from ".$table." where order_grid_id ='".$orderData."' and attribute ='firstname'";
|
| 187 |
$firstname = $readConnection->fetchOne($query);
|
| 188 |
$query = "select value from ".$table." where order_grid_id ='".$orderData."' and attribute ='lastname'";
|
| 189 |
$lastname = $readConnection->fetchOne($query);
|
| 190 |
$query = "select value from ".$table." where order_grid_id ='".$orderData."' and attribute ='email'";
|
| 191 |
-
$email = $readConnection->fetchOne($query)
|
| 192 |
$query = "select value from ".$table." where order_grid_id ='".$orderData."' and attribute ='telephone_no'";
|
| 193 |
$telephone_no = $readConnection->fetchOne($query);
|
| 194 |
-
|
| 195 |
-
|
| 196 |
-
|
| 197 |
-
|
| 198 |
-
|
| 199 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 200 |
if(!empty($receivertel)){
|
| 201 |
?>
|
| 202 |
<br/>T (Provided by Receiver): <?php echo $receivertel; ?>
|
|
@@ -207,4 +224,4 @@ $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium',
|
|
| 207 |
</div>
|
| 208 |
</div>
|
| 209 |
<div class="clear"></div>
|
| 210 |
-
<?php endif; ?>
|
| 177 |
$clm24_model = Mage::getModel("myidshipping/ordergrid");
|
| 178 |
$orderClm24Data = $clm24_model->getCollection()->addFieldToFilter('order_id',$_order->getRealOrderId())->getFirstItem();
|
| 179 |
$orderData = $orderClm24Data->getEntityId();
|
| 180 |
+
|
| 181 |
$resource = Mage::getSingleton('core/resource');
|
| 182 |
$readConnection = $resource->getConnection('core_read');
|
| 183 |
$writeConnection = $resource->getConnection('core_write');
|
| 184 |
$table = $resource->getTableName('myidshipping/shipping');
|
| 185 |
+
|
| 186 |
+
/*$query = "select value from ".$table." where order_grid_id ='".$orderData."' and attribute ='r_telephone'";
|
| 187 |
$receivertel = $readConnection->fetchOne($query);
|
| 188 |
$query = "select value from ".$table." where order_grid_id ='".$orderData."' and attribute ='firstname'";
|
| 189 |
$firstname = $readConnection->fetchOne($query);
|
| 190 |
$query = "select value from ".$table." where order_grid_id ='".$orderData."' and attribute ='lastname'";
|
| 191 |
$lastname = $readConnection->fetchOne($query);
|
| 192 |
$query = "select value from ".$table." where order_grid_id ='".$orderData."' and attribute ='email'";
|
| 193 |
+
$email = $readConnection->fetchOne($query);*/
|
| 194 |
$query = "select value from ".$table." where order_grid_id ='".$orderData."' and attribute ='telephone_no'";
|
| 195 |
$telephone_no = $readConnection->fetchOne($query);
|
| 196 |
+
|
| 197 |
+
$name = $orderClm24Data->getRName() . '<br/>' .$orderClm24Data->getEmail();
|
| 198 |
+
$receivertel = $orderClm24Data->getRTelephone();
|
| 199 |
+
$pos1 = stripos($_shippinng_address, 'ShipToMyID Service');
|
| 200 |
+
$pos2 = stripos($_shippinng_address, 'Ship2MyId Service');
|
| 201 |
+
if($pos1 !== false || $pos2 !== false ){
|
| 202 |
+
echo $name . '</br>';
|
| 203 |
+
echo Mage::getStoreConfig('clm24core/shippings/ship2myid_label') . "</br>";
|
| 204 |
+
echo Mage::getStoreConfig('clm24core/shippings/street_line1') . "</br>";
|
| 205 |
+
echo Mage::getStoreConfig('clm24core/shippings/street_line2') . "</br>";
|
| 206 |
+
echo "XX";//Mage::getStoreConfig('clm24core/shippings/city') . "</br>";
|
| 207 |
+
echo "XXXXX" . "</br>";
|
| 208 |
+
echo "XX" . "</br>";
|
| 209 |
+
echo "T : " . $telephone_no;
|
| 210 |
+
}else{
|
| 211 |
+
$_shippinng_address = str_ireplace('ShipToMyID Service', $name, $_shippinng_address);
|
| 212 |
+
$_shippinng_address = str_ireplace('Ship2MyId Service', $name, $_shippinng_address);
|
| 213 |
+
//$_shippinng_address = str_ireplace('T: X', 'T: '.$telephone_no, $_shippinng_address);
|
| 214 |
+
echo $_shippinng_address;
|
| 215 |
+
}
|
| 216 |
+
$receivertel = str_ireplace(array('Nil'), '', $receivertel);
|
| 217 |
if(!empty($receivertel)){
|
| 218 |
?>
|
| 219 |
<br/>T (Provided by Receiver): <?php echo $receivertel; ?>
|
| 224 |
</div>
|
| 225 |
</div>
|
| 226 |
<div class="clear"></div>
|
| 227 |
+
<?php endif; ?>
|
app/design/frontend/base/default/template/myidshipping/myidshipping.phtml
CHANGED
|
@@ -29,7 +29,7 @@ if(isset($marketplace_details['Marketplace']['marketplace_image']) && !empty($ma
|
|
| 29 |
$popup_url .= '&image=' . urlencode($marketplace_details['Marketplace']['marketplace_image']);
|
| 30 |
}
|
| 31 |
|
| 32 |
-
$popup_url .= '&callback=' . $this->getUrl('myidshipping/index/postback');
|
| 33 |
|
| 34 |
?>
|
| 35 |
|
| 29 |
$popup_url .= '&image=' . urlencode($marketplace_details['Marketplace']['marketplace_image']);
|
| 30 |
}
|
| 31 |
|
| 32 |
+
$popup_url .= '&callback=' . $this->getUrl('myidshipping/index/postback',array('_secure'=>true));
|
| 33 |
|
| 34 |
?>
|
| 35 |
|
app/design/frontend/base/default/template/myidshipping/sales/order/info.phtml
CHANGED
|
@@ -56,8 +56,8 @@
|
|
| 56 |
$clm24_model = Mage::getModel("myidshipping/ordergrid")->getCollection()
|
| 57 |
->addFieldToFilter('main_table.order_id', array('eq' => $_order->getIncrementId()))->getFirstItem();
|
| 58 |
$orderData = $clm24_model->getEntityId();
|
| 59 |
-
|
| 60 |
-
|
| 61 |
$readConnection = $resource->getConnection('core_read');
|
| 62 |
$writeConnection = $resource->getConnection('core_write');
|
| 63 |
$table = $resource->getTableName('myidshipping/shipping');
|
|
@@ -66,17 +66,17 @@
|
|
| 66 |
$query = "select value from ".$table." where order_grid_id ='".$orderData."' and attribute ='lastname'";
|
| 67 |
$lastname = $readConnection->fetchOne($query);
|
| 68 |
$query = "select value from ".$table." where order_grid_id ='".$orderData."' and attribute ='email'";
|
| 69 |
-
$email = $readConnection->fetchOne($query)
|
| 70 |
-
$name =
|
| 71 |
?>
|
| 72 |
<address>
|
| 73 |
<?php echo $name ?></br>
|
| 74 |
<?php echo Mage::getStoreConfig('clm24core/shippings/ship2myid_label');?></br>
|
| 75 |
<?php echo Mage::getStoreConfig('clm24core/shippings/street_line1');?></br>
|
| 76 |
-
|
| 77 |
-
|
| 78 |
-
|
| 79 |
-
|
| 80 |
</address>
|
| 81 |
<?php }else{
|
| 82 |
?>
|
| 56 |
$clm24_model = Mage::getModel("myidshipping/ordergrid")->getCollection()
|
| 57 |
->addFieldToFilter('main_table.order_id', array('eq' => $_order->getIncrementId()))->getFirstItem();
|
| 58 |
$orderData = $clm24_model->getEntityId();
|
| 59 |
+
if($orderData){
|
| 60 |
+
/*$resource = Mage::getSingleton('core/resource');
|
| 61 |
$readConnection = $resource->getConnection('core_read');
|
| 62 |
$writeConnection = $resource->getConnection('core_write');
|
| 63 |
$table = $resource->getTableName('myidshipping/shipping');
|
| 66 |
$query = "select value from ".$table." where order_grid_id ='".$orderData."' and attribute ='lastname'";
|
| 67 |
$lastname = $readConnection->fetchOne($query);
|
| 68 |
$query = "select value from ".$table." where order_grid_id ='".$orderData."' and attribute ='email'";
|
| 69 |
+
$email = $readConnection->fetchOne($query);*/
|
| 70 |
+
$name = $clm24_model->getRName() . '<br/>' .$clm24_model->getEmail();
|
| 71 |
?>
|
| 72 |
<address>
|
| 73 |
<?php echo $name ?></br>
|
| 74 |
<?php echo Mage::getStoreConfig('clm24core/shippings/ship2myid_label');?></br>
|
| 75 |
<?php echo Mage::getStoreConfig('clm24core/shippings/street_line1');?></br>
|
| 76 |
+
<?php echo Mage::getStoreConfig('clm24core/shippings/street_line2');?></br>
|
| 77 |
+
<?php echo "XX";//Mage::getStoreConfig('clm24core/shippings/city');?></br>
|
| 78 |
+
<?php echo "XXXXX"?></br>
|
| 79 |
+
<?php echo "XX"?></br>
|
| 80 |
</address>
|
| 81 |
<?php }else{
|
| 82 |
?>
|
app/locale/en_US/template/email/sales/clm24/creditmemo_new.html
CHANGED
|
@@ -86,9 +86,9 @@ body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif;
|
|
| 86 |
{{config path='clm24core/shippings/ship2myid_label'}}<br>
|
| 87 |
{{config path='clm24core/shippings/street_line1'}}<br>
|
| 88 |
{{config path='clm24core/shippings/street_line2'}}<br>
|
| 89 |
-
|
| 90 |
-
|
| 91 |
-
|
| 92 |
{{else}}
|
| 93 |
{{var order.get_original_shipping_address()}}
|
| 94 |
{{/if}}
|
| 86 |
{{config path='clm24core/shippings/ship2myid_label'}}<br>
|
| 87 |
{{config path='clm24core/shippings/street_line1'}}<br>
|
| 88 |
{{config path='clm24core/shippings/street_line2'}}<br>
|
| 89 |
+
XX<br>
|
| 90 |
+
XXXXX<br>
|
| 91 |
+
XX<br>
|
| 92 |
{{else}}
|
| 93 |
{{var order.get_original_shipping_address()}}
|
| 94 |
{{/if}}
|
app/locale/en_US/template/email/sales/clm24/creditmemo_new_guest.html
CHANGED
|
@@ -84,9 +84,9 @@ body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif;
|
|
| 84 |
{{config path='clm24core/shippings/ship2myid_label'}}<br>
|
| 85 |
{{config path='clm24core/shippings/street_line1'}}<br>
|
| 86 |
{{config path='clm24core/shippings/street_line2'}}<br>
|
| 87 |
-
|
| 88 |
-
|
| 89 |
-
|
| 90 |
{{else}}
|
| 91 |
{{var order.get_original_shipping_address()}}
|
| 92 |
{{/if}}
|
| 84 |
{{config path='clm24core/shippings/ship2myid_label'}}<br>
|
| 85 |
{{config path='clm24core/shippings/street_line1'}}<br>
|
| 86 |
{{config path='clm24core/shippings/street_line2'}}<br>
|
| 87 |
+
XX<br>
|
| 88 |
+
XXXXX<br>
|
| 89 |
+
XX<br>
|
| 90 |
{{else}}
|
| 91 |
{{var order.get_original_shipping_address()}}
|
| 92 |
{{/if}}
|
app/locale/en_US/template/email/sales/clm24/invoice_new.html
CHANGED
|
@@ -86,9 +86,9 @@ body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif;
|
|
| 86 |
{{config path='clm24core/shippings/ship2myid_label'}}<br>
|
| 87 |
{{config path='clm24core/shippings/street_line1'}}<br>
|
| 88 |
{{config path='clm24core/shippings/street_line2'}}<br>
|
| 89 |
-
|
| 90 |
-
|
| 91 |
-
|
| 92 |
{{else}}
|
| 93 |
{{var order.get_original_shipping_address()}}
|
| 94 |
{{/if}}
|
| 86 |
{{config path='clm24core/shippings/ship2myid_label'}}<br>
|
| 87 |
{{config path='clm24core/shippings/street_line1'}}<br>
|
| 88 |
{{config path='clm24core/shippings/street_line2'}}<br>
|
| 89 |
+
XX<br>
|
| 90 |
+
XXXXX<br>
|
| 91 |
+
XX<br>
|
| 92 |
{{else}}
|
| 93 |
{{var order.get_original_shipping_address()}}
|
| 94 |
{{/if}}
|
app/locale/en_US/template/email/sales/clm24/invoice_new_guest.html
CHANGED
|
@@ -84,9 +84,9 @@ body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif;
|
|
| 84 |
{{config path='clm24core/shippings/ship2myid_label'}}<br>
|
| 85 |
{{config path='clm24core/shippings/street_line1'}}<br>
|
| 86 |
{{config path='clm24core/shippings/street_line2'}}<br>
|
| 87 |
-
|
| 88 |
-
|
| 89 |
-
|
| 90 |
{{else}}
|
| 91 |
{{var order.get_original_shipping_address()}}
|
| 92 |
{{/if}}
|
| 84 |
{{config path='clm24core/shippings/ship2myid_label'}}<br>
|
| 85 |
{{config path='clm24core/shippings/street_line1'}}<br>
|
| 86 |
{{config path='clm24core/shippings/street_line2'}}<br>
|
| 87 |
+
XX<br>
|
| 88 |
+
XXXXX<br>
|
| 89 |
+
XX<br>
|
| 90 |
{{else}}
|
| 91 |
{{var order.get_original_shipping_address()}}
|
| 92 |
{{/if}}
|
app/locale/en_US/template/email/sales/clm24/shipment_new.html
CHANGED
|
@@ -89,9 +89,9 @@ body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif;
|
|
| 89 |
{{config path='clm24core/shippings/ship2myid_label'}}<br>
|
| 90 |
{{config path='clm24core/shippings/street_line1'}}<br>
|
| 91 |
{{config path='clm24core/shippings/street_line2'}}<br>
|
| 92 |
-
|
| 93 |
-
|
| 94 |
-
|
| 95 |
{{else}}
|
| 96 |
{{var order.get_original_shipping_address()}}
|
| 97 |
{{/if}}
|
| 89 |
{{config path='clm24core/shippings/ship2myid_label'}}<br>
|
| 90 |
{{config path='clm24core/shippings/street_line1'}}<br>
|
| 91 |
{{config path='clm24core/shippings/street_line2'}}<br>
|
| 92 |
+
XX<br>
|
| 93 |
+
XXXXX<br>
|
| 94 |
+
XX<br>
|
| 95 |
{{else}}
|
| 96 |
{{var order.get_original_shipping_address()}}
|
| 97 |
{{/if}}
|
app/locale/en_US/template/email/sales/clm24/shipment_new_guest.html
CHANGED
|
@@ -87,9 +87,9 @@ body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif;
|
|
| 87 |
{{config path='clm24core/shippings/ship2myid_label'}}<br>
|
| 88 |
{{config path='clm24core/shippings/street_line1'}}<br>
|
| 89 |
{{config path='clm24core/shippings/street_line2'}}<br>
|
| 90 |
-
|
| 91 |
-
|
| 92 |
-
|
| 93 |
{{else}}
|
| 94 |
{{var order.get_original_shipping_address()}}
|
| 95 |
{{/if}}
|
| 87 |
{{config path='clm24core/shippings/ship2myid_label'}}<br>
|
| 88 |
{{config path='clm24core/shippings/street_line1'}}<br>
|
| 89 |
{{config path='clm24core/shippings/street_line2'}}<br>
|
| 90 |
+
XX<br>
|
| 91 |
+
XXXXX<br>
|
| 92 |
+
XX<br>
|
| 93 |
{{else}}
|
| 94 |
{{var order.get_original_shipping_address()}}
|
| 95 |
{{/if}}
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Ship2MyID</name>
|
| 4 |
-
<version>1.4.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL 3.0)</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -11,9 +11,9 @@
|
|
| 11 |
Register here to enable REAL social commerce in your store!</description>
|
| 12 |
<notes>Ship2MyId Magento Extension Stable Module. </notes>
|
| 13 |
<authors><author><name>MapMyId Inc.</name><user>mapmyid</user><email>developer@ship2myid.com</email></author></authors>
|
| 14 |
-
<date>2015-
|
| 15 |
-
<time>
|
| 16 |
-
<contents><target name="magelocal"><dir name="Xclm24"><dir name="Checkout"><dir name="controllers"><file name="OnepageController.php" hash="efc22613a981261e85f96834066fdf05"/></dir><dir name="etc"><file name="config.xml" hash="
|
| 17 |
<compatible/>
|
| 18 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><package><name>Mage_Checkout</name><channel>core</channel><min></min><max></max></package></required></dependencies>
|
| 19 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Ship2MyID</name>
|
| 4 |
+
<version>1.4.1</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL 3.0)</license>
|
| 7 |
<channel>community</channel>
|
| 11 |
Register here to enable REAL social commerce in your store!</description>
|
| 12 |
<notes>Ship2MyId Magento Extension Stable Module. </notes>
|
| 13 |
<authors><author><name>MapMyId Inc.</name><user>mapmyid</user><email>developer@ship2myid.com</email></author></authors>
|
| 14 |
+
<date>2015-08-10</date>
|
| 15 |
+
<time>09:20:31</time>
|
| 16 |
+
<contents><target name="magelocal"><dir name="Xclm24"><dir name="Checkout"><dir name="controllers"><file name="OnepageController.php" hash="efc22613a981261e85f96834066fdf05"/></dir><dir name="etc"><file name="config.xml" hash="c1073ed691b7d16dddd67d9f9667fc30"/></dir></dir><dir name="Myidshipping"><dir name="Block"><dir name="Adminhtml"><dir name="Promo"><dir name="Quote"><dir name="Edit"><dir name="Tab"><file name="Main.php" hash="d81c26cff7907299df6f41d6008c4f4b"/></dir></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint.php" hash="fef2db22eed506980faea5eeb135fafb"/></dir></dir></dir></dir><dir name="GiftMessage"><dir name="Message"><file name="Inline.php" hash="33b3682eaa2c0fd59ae94369a0218dd7"/></dir></dir><file name="Myidpopup.php" hash="61eaa1dea2b2505feed44681995953fd"/></dir><dir name="Helper"><file name="Data.php" hash="a99d45ce79547a747c85565b1a04f51d"/></dir><file name="LICENSE.txt" hash="59563e7be45096d0833dade102989042"/><dir name="Model"><dir name="Api"><file name="Nvp.php" hash="0ac25c34c98391870ed2e7f45c797639"/><file name="Standard.php" hash="35e6cfcee7606110691d7e7e07f1b10b"/></dir><file name="Coupon.php" hash="1dff0475ea05f05aa86e5f63d99224ea"/><file name="Cron.php" hash="f6255482241971e10b43bb9676489bc6"/><dir name="Mysql4"><dir name="Coupon"><file name="Collection.php" hash="84559f99e67f3913caa91d74729d5104"/></dir><file name="Coupon.php" hash="acc94953a52808c545794e2d5752248c"/><dir name="Ordergrid"><file name="Collection.php" hash="a31f1eb9bcbe03a9aa15a30e822ee073"/></dir><file name="Ordergrid.php" hash="5b950a238ba37ff4aee133083431423b"/><dir name="Shipping"><file name="Collection.php" hash="efe8417de77ef666b629ab6a446b5cae"/></dir><file name="Shipping.php" hash="c479f47b3119165301b84a9eea5f1992"/></dir><file name="Observer.php" hash="b155787e9c6653ce37de621e8af52186"/><dir name="Order"><file name="Creditmemo.php" hash="65cd9109bf90479db25a39acdd5de4f8"/><file name="Invoice.php" hash="b8946860ca48a755355cd20cab70e78b"/><file name="Shipment.php" hash="a5be17ffd46f7a6202fd96fb22545a6e"/></dir><file name="Order.php" hash="ef9700e02d184af0d3e56140e5227ec3"/><file name="Ordergrid.php" hash="e006c1a3daa90a3f84dcfddea6979dae"/><dir name="Resource"><dir name="Coupon"><file name="Collection.php" hash="518b705cfacfefd02db01bec52999972"/></dir><file name="Coupon.php" hash="ea9fee0dd1a14be1ea7f0936bee82035"/><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="0b13f7d0133e561e4bf3f448bf44f44c"/></dir></dir><dir name="Ordergrid"><file name="Collection.php" hash="7671ca6dfa5a62cf8037d4acacd598c9"/></dir><file name="Ordergrid.php" hash="570a985955c24d506dda7a33151d8414"/><dir name="Shipping"><file name="Collection.php" hash="f553b04dbf63ac941268b386cb333b61"/></dir><file name="Shipping.php" hash="1767bc02fd55ba51f6745b9a62a1a121"/></dir><file name="Shipping.php" hash="9c5c756ed365206990c3f77f01bcf1d4"/><dir name="System"><dir name="Config"><dir name="Source"><dir name="Order"><dir name="Status"><file name="New.php" hash="542285a4fa3a77ed8fb0eb7dcc6e369a"/><file name="Rejected.php" hash="fbe4674a1471683f3a4b01c4d4361991"/></dir></dir></dir></dir></dir></dir><dir name="controllers"><file name="CronController.php" hash="352837a38d04f59497a43be3a951289a"/><file name="IndexController.php" hash="d970373d86729a46af454b375365b7a3"/></dir><dir name="etc"><file name="adminhtml.xml" hash="dec0f9034356963e260ab4532d631bc3"/><file name="config.xml" hash="4e015c72c9334b1d943b70f489f071f6"/><file name="system.xml" hash="705c7f81c8ff2bad597551092f4a2de5"/></dir><dir name="sql"><dir name="myidshipping_setup"><file name="install-1.0.php" hash="84ab9bd0fb4f5e0ef4c0389a0dca6f36"/><file name="upgrade-1.0-1.1.php" hash="23f0df21d4bd073b9286f93da47b3e34"/><file name="upgrade-1.1-1.2.php" hash="34c92eee704ace71d0c6154a020f6633"/><file name="upgrade-1.2-1.3.php" hash="56b234bd51d180620f1a64e5c7c14abd"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="myidshipping.xml" hash="7d048f5c1b1959115419cb2c58990a8e"/></dir><dir name="template"><dir name="myidshipping"><dir name="sales"><dir name="order"><dir name="view"><file name="info.phtml" hash="e61ef1afffd8a464326d732f0f244e4f"/></dir></dir></dir><dir name="system"><dir name="config"><dir name="fieldset"><file name="hint.phtml" hash="4fb0e5b17f7c5b26285967592c066caf"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="myidshipping.xml" hash="992ccb073f766d243a0b825c31d8cc79"/></dir><dir name="template"><dir name="myidshipping"><file name="myidpopup.phtml" hash="ea0ab75a33179bdf3e1c2d45ea1288f5"/><file name="myidshipping.phtml" hash="e010ccdae1b4b387903824c9e58a8002"/><dir name="progress"><file name="progress.phtml" hash="e66ad55efe086847054ce34471330865"/><file name="shipping.phtml" hash="f6a97b28ddbeeca7c1d04e199c92e7fd"/></dir><dir name="sales"><dir name="order"><file name="info.phtml" hash="ba1a22e7b09da06bef501e20849b420d"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Xclm24_Myidshipping.xml" hash="2aaef5e2e38924097f2d487e821a1d26"/><file name="Xclm24_Checkout.xml" hash="504077779b6e8a153fbdc6c3c3bbaa14"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="myshipping"><file name="lightwindow.css" hash="70a6e0d4109d320796567aeeb0f3443f"/></dir></dir><dir name="images"><dir name="mapmyid"><file name="ajax-loading.gif" hash="b6f30f316d3c10432a336a9450a2308d"/><file name="arrow-down.gif" hash="26948110b136eff06423e1acc3b911e8"/><file name="arrow-up.gif" hash="020ae96cf8ca950ed90cd3f180ab96ad"/><file name="backgroundlight.jpg" hash="f44fd699b18ff9a67a920e3e4cd3a28c"/><file name="black-70.png" hash="703c659e4bf563a05c6338a1727e006c"/><file name="black.png" hash="1cf6a7fbea37bc350912f2d2094c2813"/><file name="nextlabel.gif" hash="485d89b62f7af7f0ce9427bb9a636e7e"/><file name="pattern_148-70.png" hash="e04ddfd5cacaa73a6b8edf5fbafe8b82"/><file name="pattern_148.gif" hash="4d56d8d3360beee6f8219ea394e0ead0"/><file name="prevlabel.gif" hash="d935f4acf56e0b83218bbdb5835e4e23"/></dir><file name="ship2myidlogo.png" hash="64a9f196c16dda35e04a26d9f2c9958c"/></dir><dir name="js"><dir name="myshipping"><file name="inline.js" hash="077f4d1c83424212581f48643dbcf8d6"/><file name="lightwindow.js" hash="d4ab0eb3f82984aa62bdf75aa43e0fbb"/></dir></dir></dir></dir></dir></target><target name="mage"><dir name="app"><dir name="locale"><dir name="en_US"><dir name="template"><dir name="email"><dir name="sales"><dir name="clm24"><file name="creditmemo_new.html" hash="94b5f427323afe41dd0b90f4d3fd0f5c"/><file name="creditmemo_new_guest.html" hash="fb56535573ae8b9b528e71dfaabb68ee"/><file name="invoice_new.html" hash="b20ab121bf902ce71c4618ca07b8dc4c"/><file name="invoice_new_guest.html" hash="fd3e5d66989c0675e6f3b148240b6e7e"/><file name="order_new.html" hash="883d051a7ebd14dcf3fa19c1e19223f1"/><file name="order_new_guest.html" hash="f49b5c28657c191659bdf1c31b1746df"/><file name="shipment_new.html" hash="ede59588f6fc75dc309c7a217b83c7dc"/><file name="shipment_new_guest.html" hash="771c2fec020c9a0947b4a15cbd50f15d"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
|
| 17 |
<compatible/>
|
| 18 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><package><name>Mage_Checkout</name><channel>core</channel><min></min><max></max></package></required></dependencies>
|
| 19 |
</package>
|
skin/frontend/base/default/css/myshipping/lightwindow.css
CHANGED
|
@@ -14,7 +14,7 @@
|
|
| 14 |
|
| 15 |
#lightwindow_iframe{
|
| 16 |
/*background-color: #285ea0; */
|
| 17 |
-
background:url("../../images/mapmyid/backgroundlight.
|
| 18 |
padding-top: 5px;
|
| 19 |
vertical-align: middle;
|
| 20 |
}
|
|
@@ -59,7 +59,7 @@
|
|
| 59 |
position: relative;
|
| 60 |
border: 10px solid #ffffff;
|
| 61 |
/*background-color: #285ea0;*/
|
| 62 |
-
background:url("../../images/mapmyid/backgroundlight.
|
| 63 |
padding: 0px !important;
|
| 64 |
}
|
| 65 |
|
| 14 |
|
| 15 |
#lightwindow_iframe{
|
| 16 |
/*background-color: #285ea0; */
|
| 17 |
+
background:url("../../images/mapmyid/backgroundlight.jpg");
|
| 18 |
padding-top: 5px;
|
| 19 |
vertical-align: middle;
|
| 20 |
}
|
| 59 |
position: relative;
|
| 60 |
border: 10px solid #ffffff;
|
| 61 |
/*background-color: #285ea0;*/
|
| 62 |
+
background:url("../../images/mapmyid/backgroundlight.jpg");
|
| 63 |
padding: 0px !important;
|
| 64 |
}
|
| 65 |
|
skin/frontend/base/default/images/mapmyid/backgroundlight.png
DELETED
|
Binary file
|
