Version Notes
Ship2MyId Magento Extension Stable Module.
Download this release
Release Info
Developer | MapMyId Inc. |
Extension | Ship2MyID |
Version | 1.4.0 |
Comparing to | |
See all releases |
Code changes from version 1.3.0 to 1.4.0
- app/code/local/Xclm24/Myidshipping/Helper/Data.php +40 -0
- app/code/local/Xclm24/Myidshipping/Model/Observer.php +19 -6
- app/code/local/Xclm24/Myidshipping/Model/Order.php +186 -0
- app/code/local/Xclm24/Myidshipping/etc/config.xml +1 -1
- app/code/local/Xclm24/Myidshipping/etc/system.xml +1 -1
- app/code/local/Xclm24/Myidshipping/sql/myidshipping_setup/upgrade-1.3-1.4.php +16 -0
- app/design/frontend/base/default/template/myidshipping/myidshipping.phtml +13 -1
- package.xml +4 -4
app/code/local/Xclm24/Myidshipping/Helper/Data.php
CHANGED
@@ -950,4 +950,44 @@ class Xclm24_Myidshipping_Helper_Data extends Mage_Core_Helper_Abstract
|
|
950 |
$_cml24Helper->closeMyIDSession($_clm24Session);
|
951 |
}
|
952 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
953 |
}
|
950 |
$_cml24Helper->closeMyIDSession($_clm24Session);
|
951 |
}
|
952 |
|
953 |
+
public function getMarketplaceDetails()
|
954 |
+
{
|
955 |
+
|
956 |
+
$marketplace_details = array();
|
957 |
+
$session = Mage::getSingleton('core/session');
|
958 |
+
$marketplace_details = $session->getMarketplaceDetails();
|
959 |
+
|
960 |
+
if (Mage::getStoreConfig('clm24core/shippings/debug') == 1) {
|
961 |
+
Mage::Log("Clm24 [marketplace_details]: " . print_r($marketplace_details, true));
|
962 |
+
}
|
963 |
+
|
964 |
+
if(empty($marketplace_details) ){
|
965 |
+
$marketplace_details = $this->_getMarketplaceDetails();
|
966 |
+
$session->setMarketplaceDetails($marketplace_details);
|
967 |
+
}
|
968 |
+
return $marketplace_details;
|
969 |
+
|
970 |
+
}
|
971 |
+
|
972 |
+
private function _getMarketplaceDetails(){
|
973 |
+
|
974 |
+
$_clm24Session = $this->getMyIDSession();
|
975 |
+
$marketplace_details = array();
|
976 |
+
$url = Mage::getStoreConfig('clm24core/shippings/clm24Url') . "/order/marketplacedetails?";
|
977 |
+
$_requestUrl = $url . "access_token=" . $_clm24Session ;
|
978 |
+
$ch = curl_init($_requestUrl);
|
979 |
+
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
|
980 |
+
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "GET");
|
981 |
+
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
|
982 |
+
$response = curl_exec($ch);
|
983 |
+
curl_close($ch);
|
984 |
+
if (Mage::getStoreConfig('clm24core/shippings/debug') == 1) {
|
985 |
+
Mage::Log("Clm24 [marketplace_details API Response]: " . print_r($response, true));
|
986 |
+
}
|
987 |
+
|
988 |
+
if ($response) {
|
989 |
+
$marketplace_details = Zend_Json::decode($response);
|
990 |
+
}
|
991 |
+
return $marketplace_details;
|
992 |
+
}
|
993 |
}
|
app/code/local/Xclm24/Myidshipping/Model/Observer.php
CHANGED
@@ -171,7 +171,8 @@ class Xclm24_Myidshipping_Model_Observer
|
|
171 |
$_clm24Data = $session->getData('ship2myid');
|
172 |
$use_mapmyid = $session->getData('use_mapmyid');
|
173 |
if (!empty($_clm24Data) && isset($_clm24Data['email']) && $_clm24Data['email'] <> '' && $use_mapmyid) {
|
174 |
-
|
|
|
175 |
$result->isAvailable = false;
|
176 |
}
|
177 |
}
|
@@ -280,6 +281,9 @@ class Xclm24_Myidshipping_Model_Observer
|
|
280 |
"max_shipment" => 1,
|
281 |
"order_group_id" => $_clm24Order["external_order_group_id"],
|
282 |
"order_status_id" => $_order_status_id,
|
|
|
|
|
|
|
283 |
"created_at" => date('Y-m-d H:i:s'),
|
284 |
"updated_at" => date('Y-m-d H:i:s')
|
285 |
);
|
@@ -290,6 +294,9 @@ class Xclm24_Myidshipping_Model_Observer
|
|
290 |
"max_shipment" => 0,
|
291 |
"order_group_id" => $_clm24Order["external_order_group_id"],
|
292 |
"order_status_id" => $_order_status_id,
|
|
|
|
|
|
|
293 |
"created_at" => date('Y-m-d H:i:s'),
|
294 |
"updated_at" => date('Y-m-d H:i:s')
|
295 |
);
|
@@ -353,6 +360,9 @@ class Xclm24_Myidshipping_Model_Observer
|
|
353 |
"max_shipment" => 1,
|
354 |
"order_group_id" => $_clm24Order["external_order_group_id"],
|
355 |
"order_status_id" => $_order_status_id,
|
|
|
|
|
|
|
356 |
"created_at" => date('Y-m-d H:i:s'),
|
357 |
"updated_at" => date('Y-m-d H:i:s')
|
358 |
);
|
@@ -363,6 +373,9 @@ class Xclm24_Myidshipping_Model_Observer
|
|
363 |
"max_shipment" => 0,
|
364 |
"order_group_id" => $_clm24Order["external_order_group_id"],
|
365 |
"order_status_id" => $_order_status_id,
|
|
|
|
|
|
|
366 |
"created_at" => date('Y-m-d H:i:s'),
|
367 |
"updated_at" => date('Y-m-d H:i:s')
|
368 |
);
|
@@ -410,10 +423,10 @@ class Xclm24_Myidshipping_Model_Observer
|
|
410 |
$collection = $observer->getOrderGridCollection();
|
411 |
$select = $collection->getSelect();
|
412 |
$clm24Table = Mage::getSingleton('core/resource')->getTableName('clm24_myidshipping_ordergrid');
|
413 |
-
|
414 |
|
415 |
-
$select->joinLeft($clm24Table, 'main_table.increment_id = ' . $clm24Table . '.order_id', array('order_group_id', 'order_status_id', 'max_shipment'));
|
416 |
-
|
417 |
//$select->joinLeft(array('clm2' => $clm24MyShipping), $clm24Table . '.entity_id = clm2.order_grid_id AND clm2.attribute = "firstname" ', array('clm2.value as rec_firstname'));
|
418 |
//$select->joinLeft(array('clm3' => $clm24MyShipping), $clm24Table . '.entity_id = clm3.order_grid_id AND clm3.attribute = "lastname" ', array( ' CONCAT_WS(" ", clm2.`value` , clm3.`value`) as shipping_name' ));
|
419 |
|
@@ -453,7 +466,7 @@ class Xclm24_Myidshipping_Model_Observer
|
|
453 |
if (Mage::getStoreConfig('clm24core/shippings/enabled')) {
|
454 |
$block = $observer->getEvent()->getBlock();
|
455 |
$clm24Table = Mage::getSingleton('core/resource')->getTableName('clm24_myidshipping_ordergrid');
|
456 |
-
|
457 |
if (strpos((get_class($block)), 'Sales_Order_Grid')) {
|
458 |
$block->removeColumn('created_at');
|
459 |
$block->addColumnAfter('created_at', array(
|
@@ -467,7 +480,7 @@ class Xclm24_Myidshipping_Model_Observer
|
|
467 |
'header' => Mage::helper('sales')->__('Rec. Email '),
|
468 |
'index' => 'rec_email',
|
469 |
'width' => '150px',
|
470 |
-
'filter_index' => '
|
471 |
), 'shipping_name');
|
472 |
|
473 |
$block->addColumnAfter('order_status_id', array(
|
171 |
$_clm24Data = $session->getData('ship2myid');
|
172 |
$use_mapmyid = $session->getData('use_mapmyid');
|
173 |
if (!empty($_clm24Data) && isset($_clm24Data['email']) && $_clm24Data['email'] <> '' && $use_mapmyid) {
|
174 |
+
$search = stripos($method->getCode(), 'paypal_express');
|
175 |
+
if ($method->getCode() == 'paypal_express' || $search !== false) {
|
176 |
$result->isAvailable = false;
|
177 |
}
|
178 |
}
|
281 |
"max_shipment" => 1,
|
282 |
"order_group_id" => $_clm24Order["external_order_group_id"],
|
283 |
"order_status_id" => $_order_status_id,
|
284 |
+
"email" => $_clm24Order['receiver_email_address'],
|
285 |
+
"r_name" => $_clm24Order["receiver_first_name"]. " " . $_clm24Order["receiver_last_name"],
|
286 |
+
"r_telephone" => $tele,
|
287 |
"created_at" => date('Y-m-d H:i:s'),
|
288 |
"updated_at" => date('Y-m-d H:i:s')
|
289 |
);
|
294 |
"max_shipment" => 0,
|
295 |
"order_group_id" => $_clm24Order["external_order_group_id"],
|
296 |
"order_status_id" => $_order_status_id,
|
297 |
+
"email" => $_clm24Order['receiver_email_address'],
|
298 |
+
"r_name" => $_clm24Order["receiver_first_name"]. " " . $_clm24Order["receiver_last_name"],
|
299 |
+
"r_telephone" => $tele,
|
300 |
"created_at" => date('Y-m-d H:i:s'),
|
301 |
"updated_at" => date('Y-m-d H:i:s')
|
302 |
);
|
360 |
"max_shipment" => 1,
|
361 |
"order_group_id" => $_clm24Order["external_order_group_id"],
|
362 |
"order_status_id" => $_order_status_id,
|
363 |
+
"email" => $_clm24Order['receiver_email_address'],
|
364 |
+
"r_name" => $_clm24Order["receiver_first_name"]. " " . $_clm24Order["receiver_last_name"],
|
365 |
+
"r_telephone" => $tele,
|
366 |
"created_at" => date('Y-m-d H:i:s'),
|
367 |
"updated_at" => date('Y-m-d H:i:s')
|
368 |
);
|
373 |
"max_shipment" => 0,
|
374 |
"order_group_id" => $_clm24Order["external_order_group_id"],
|
375 |
"order_status_id" => $_order_status_id,
|
376 |
+
"email" => $_clm24Order['receiver_email_address'],
|
377 |
+
"r_name" => $_clm24Order["receiver_first_name"]. " " . $_clm24Order["receiver_last_name"],
|
378 |
+
"r_telephone" => $tele,
|
379 |
"created_at" => date('Y-m-d H:i:s'),
|
380 |
"updated_at" => date('Y-m-d H:i:s')
|
381 |
);
|
423 |
$collection = $observer->getOrderGridCollection();
|
424 |
$select = $collection->getSelect();
|
425 |
$clm24Table = Mage::getSingleton('core/resource')->getTableName('clm24_myidshipping_ordergrid');
|
426 |
+
//$clm24MyShipping = Mage::getSingleton('core/resource')->getTableName('clm24_myidshipping');
|
427 |
|
428 |
+
$select->joinLeft($clm24Table, 'main_table.increment_id = ' . $clm24Table . '.order_id', array('order_group_id', 'order_status_id', 'max_shipment', 'email as rec_email', 'r_telephone as rec_telephone')); //, 'r_name as shipping_name'
|
429 |
+
//$select->joinLeft(array('clm1' => $clm24MyShipping), $clm24Table . '.entity_id = clm1.order_grid_id AND clm1.attribute = "email" ', array('clm1.value as rec_email'));
|
430 |
//$select->joinLeft(array('clm2' => $clm24MyShipping), $clm24Table . '.entity_id = clm2.order_grid_id AND clm2.attribute = "firstname" ', array('clm2.value as rec_firstname'));
|
431 |
//$select->joinLeft(array('clm3' => $clm24MyShipping), $clm24Table . '.entity_id = clm3.order_grid_id AND clm3.attribute = "lastname" ', array( ' CONCAT_WS(" ", clm2.`value` , clm3.`value`) as shipping_name' ));
|
432 |
|
466 |
if (Mage::getStoreConfig('clm24core/shippings/enabled')) {
|
467 |
$block = $observer->getEvent()->getBlock();
|
468 |
$clm24Table = Mage::getSingleton('core/resource')->getTableName('clm24_myidshipping_ordergrid');
|
469 |
+
//$clm24MyShipping = Mage::getSingleton('core/resource')->getTableName('clm24_myidshipping');
|
470 |
if (strpos((get_class($block)), 'Sales_Order_Grid')) {
|
471 |
$block->removeColumn('created_at');
|
472 |
$block->addColumnAfter('created_at', array(
|
480 |
'header' => Mage::helper('sales')->__('Rec. Email '),
|
481 |
'index' => 'rec_email',
|
482 |
'width' => '150px',
|
483 |
+
'filter_index' => $clm24Table . '.email',
|
484 |
), 'shipping_name');
|
485 |
|
486 |
$block->addColumnAfter('order_status_id', array(
|
app/code/local/Xclm24/Myidshipping/Model/Order.php
CHANGED
@@ -55,6 +55,10 @@ class Xclm24_Myidshipping_Model_Order extends Mage_Sales_Model_Order
|
|
55 |
|
56 |
public function sendNewOrderEmail()
|
57 |
{
|
|
|
|
|
|
|
|
|
58 |
|
59 |
$storeId = $this->getStore()->getId();
|
60 |
|
@@ -213,6 +217,187 @@ class Xclm24_Myidshipping_Model_Order extends Mage_Sales_Model_Order
|
|
213 |
|
214 |
return $this;
|
215 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
216 |
|
217 |
/**
|
218 |
* Retrieve order shipping address
|
@@ -334,6 +519,7 @@ class Xclm24_Myidshipping_Model_Order extends Mage_Sales_Model_Order
|
|
334 |
return false;
|
335 |
}
|
336 |
|
|
|
337 |
/**
|
338 |
* Retun Ship2MyId Order firstname
|
339 |
*
|
55 |
|
56 |
public function sendNewOrderEmail()
|
57 |
{
|
58 |
+
if (version_compare(Mage::getVersion(), '1.9.1.0') >= 0) {
|
59 |
+
$this->queueNewOrderEmail(true);
|
60 |
+
return $this;
|
61 |
+
}
|
62 |
|
63 |
$storeId = $this->getStore()->getId();
|
64 |
|
217 |
|
218 |
return $this;
|
219 |
}
|
220 |
+
|
221 |
+
/**
|
222 |
+
* Queue email with new order data
|
223 |
+
*
|
224 |
+
* @param bool $forceMode if true then email will be sent regardless of the fact that it was already sent previously
|
225 |
+
*
|
226 |
+
* @return Mage_Sales_Model_Order
|
227 |
+
* @throws Exception
|
228 |
+
*/
|
229 |
+
|
230 |
+
public function queueNewOrderEmail($forceMode = false)
|
231 |
+
{
|
232 |
+
$storeId = $this->getStore()->getId();
|
233 |
+
|
234 |
+
if (!Mage::helper('sales')->canSendNewOrderEmail($storeId)) {
|
235 |
+
return $this;
|
236 |
+
}
|
237 |
+
// Get the destination email addresses to send copies to
|
238 |
+
$copyTo = $this->_getEmails(self::XML_PATH_EMAIL_COPY_TO);
|
239 |
+
$copyMethod = Mage::getStoreConfig(self::XML_PATH_EMAIL_COPY_METHOD, $storeId);
|
240 |
+
|
241 |
+
// Start store emulation process
|
242 |
+
/** @var $appEmulation Mage_Core_Model_App_Emulation */
|
243 |
+
$appEmulation = Mage::getSingleton('core/app_emulation');
|
244 |
+
$initialEnvironmentInfo = $appEmulation->startEnvironmentEmulation($storeId);
|
245 |
+
|
246 |
+
try {
|
247 |
+
// Retrieve specified view block from appropriate design package (depends on emulated store)
|
248 |
+
$paymentBlock = Mage::helper('payment')->getInfoBlock($this->getPayment())
|
249 |
+
->setIsSecureMode(true);
|
250 |
+
$paymentBlock->getMethod()->setStore($storeId);
|
251 |
+
$paymentBlockHtml = $paymentBlock->toHtml();
|
252 |
+
} catch (Exception $exception) {
|
253 |
+
// Stop store emulation process
|
254 |
+
$appEmulation->stopEnvironmentEmulation($initialEnvironmentInfo);
|
255 |
+
throw $exception;
|
256 |
+
}
|
257 |
+
|
258 |
+
// Stop store emulation process
|
259 |
+
$appEmulation->stopEnvironmentEmulation($initialEnvironmentInfo);
|
260 |
+
|
261 |
+
// Retrieve corresponding email template id and customer name
|
262 |
+
if ($this->getCustomerIsGuest()) {
|
263 |
+
$templateId = Mage::getStoreConfig(self::XML_PATH_EMAIL_GUEST_TEMPLATE, $storeId);
|
264 |
+
$customerName = $this->getBillingAddress()->getName();
|
265 |
+
} else {
|
266 |
+
$templateId = Mage::getStoreConfig(self::XML_PATH_EMAIL_TEMPLATE, $storeId);
|
267 |
+
$customerName = $this->getCustomerName();
|
268 |
+
}
|
269 |
+
|
270 |
+
/** @var $mailer Mage_Core_Model_Email_Template_Mailer */
|
271 |
+
$mailer = Mage::getModel('core/email_template_mailer');
|
272 |
+
/** @var $emailInfo Mage_Core_Model_Email_Info */
|
273 |
+
$emailInfo = Mage::getModel('core/email_info');
|
274 |
+
$emailInfo->addTo($this->getCustomerEmail(), $customerName);
|
275 |
+
if ($copyTo && $copyMethod == 'bcc') {
|
276 |
+
// Add bcc to customer email
|
277 |
+
foreach ($copyTo as $email) {
|
278 |
+
$emailInfo->addBcc($email);
|
279 |
+
}
|
280 |
+
}
|
281 |
+
$mailer->addEmailInfo($emailInfo);
|
282 |
+
|
283 |
+
// Email copies are sent as separated emails if their copy method is 'copy'
|
284 |
+
if ($copyTo && $copyMethod == 'copy') {
|
285 |
+
foreach ($copyTo as $email) {
|
286 |
+
$emailInfo = Mage::getModel('core/email_info');
|
287 |
+
$emailInfo->addTo($email);
|
288 |
+
$mailer->addEmailInfo($emailInfo);
|
289 |
+
}
|
290 |
+
}
|
291 |
+
|
292 |
+
// Set all required params and send emails
|
293 |
+
$mailer->setSender(Mage::getStoreConfig(self::XML_PATH_EMAIL_IDENTITY, $storeId));
|
294 |
+
$mailer->setStoreId($storeId);
|
295 |
+
$mailer->setTemplateId($templateId);
|
296 |
+
|
297 |
+
//ship2myid Email Hide
|
298 |
+
$order_id = $this->getIncrementId();
|
299 |
+
if (Mage::getStoreConfig('clm24core/shippings/debug') == 1)
|
300 |
+
Mage::Log("Clm24 [Order_id]: ".print_r($order_id, true));
|
301 |
+
|
302 |
+
|
303 |
+
$clm24_model = Mage::getModel("myidshipping/ordergrid")->getCollection()
|
304 |
+
->addFieldToFilter('main_table.order_id', array('eq' => $order_id));
|
305 |
+
$orderData = $clm24_model->getData();
|
306 |
+
//zend_debug::dump($orderData);
|
307 |
+
|
308 |
+
if (Mage::getStoreConfig('clm24core/shippings/debug') == 1)
|
309 |
+
Mage::Log("Clm24 [ship2myid_order_data]: ".print_r($order_id, true));
|
310 |
+
|
311 |
+
$cnt = count($orderData);
|
312 |
+
|
313 |
+
if (Mage::getStoreConfig('clm24core/shippings/debug') == 1)
|
314 |
+
Mage::Log("Clm24 [ship2myid_order_data_counter]: ".print_r($cnt, true));
|
315 |
+
|
316 |
+
$clm24shipping_address = '';
|
317 |
+
$flag_ship2myid = 0;
|
318 |
+
|
319 |
+
$shipingAddress = $this->getShippingAddress();
|
320 |
+
|
321 |
+
|
322 |
+
if($shipingAddress->getFirstname() == Mage::getStoreConfig('clm24core/shippings/ship2myid_label')){
|
323 |
+
//$quote = $this->getQuote();
|
324 |
+
$quote = Mage::getModel('sales/quote')->load($this->getQuoteId());
|
325 |
+
$isMultishippingShip2myid = false;
|
326 |
+
if($quote->getIsMultiShipping()){
|
327 |
+
$isMultishippingShip2myid = true;
|
328 |
+
}
|
329 |
+
}
|
330 |
+
|
331 |
+
|
332 |
+
if($cnt > 0){
|
333 |
+
|
334 |
+
$resource = Mage::getSingleton('core/resource');
|
335 |
+
$readConnection = $resource->getConnection('core_read');
|
336 |
+
$writeConnection = $resource->getConnection('core_write');
|
337 |
+
$table = $resource->getTableName('myidshipping/shipping');
|
338 |
+
$query = "select value from ".$table." where order_grid_id ='".$orderData[0]["entity_id"]."' and (attribute ='postcode' or attribute ='zipcode')";
|
339 |
+
$postcode = $readConnection->fetchOne($query);
|
340 |
+
$postcode = ( !is_null($postcode) && !empty($postcode))? $postcode : Mage::getStoreConfig('clm24core/shippings/defaultZipCode');
|
341 |
+
|
342 |
+
$querynew = "select value from ".$table." where order_grid_id ='".$orderData[0]["entity_id"]."' and (attribute ='country_id' or attribute ='countryCode')";
|
343 |
+
$country_id = $readConnection->fetchOne($querynew);
|
344 |
+
$country_id = ( !is_null($country_id) && !empty($country_id))? $country_id : Mage::getStoreConfig('clm24core/shippings/country_id');
|
345 |
+
|
346 |
+
$countryModel = Mage::getModel('directory/country')->loadByCode($country_id);
|
347 |
+
|
348 |
+
$countryName = $countryModel->getName();
|
349 |
+
|
350 |
+
$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/ship2myid_label') . "<br>";
|
351 |
+
$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/street_line1') . "<br>";
|
352 |
+
$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/street_line2') . "<br>";
|
353 |
+
$clm24shipping_address = $clm24shipping_address . Mage::getStoreConfig('clm24core/shippings/city') . "<br>";
|
354 |
+
$clm24shipping_address = $clm24shipping_address . $postcode . "<br>";
|
355 |
+
$clm24shipping_address = $clm24shipping_address . $countryName . "<br>";
|
356 |
+
|
357 |
+
$flag_ship2myid = 1;
|
358 |
+
|
359 |
+
if (Mage::getStoreConfig('clm24core/shippings/debug') == 1)
|
360 |
+
Mage::Log("Clm24 [ship2myid-address]: ".print_r($clm24shipping_address, true));
|
361 |
+
}
|
362 |
+
else{
|
363 |
+
|
364 |
+
$countryModel = Mage::getModel('directory/country')->loadByCode($shipingAddress->getCountry_id());
|
365 |
+
|
366 |
+
$countryName = $countryModel->getName();
|
367 |
+
|
368 |
+
$clm24shipping_address = $clm24shipping_address . $shipingAddress->getName() . "<br>";
|
369 |
+
$clm24shipping_address = $clm24shipping_address . $shipingAddress->getStreetFull() . "<br>";
|
370 |
+
$clm24shipping_address = $clm24shipping_address . $shipingAddress->getCity(). "<br>";
|
371 |
+
$clm24shipping_address = $clm24shipping_address . $shipingAddress->getRegion() . "<br>";
|
372 |
+
$clm24shipping_address = $clm24shipping_address . $shipingAddress->getPostcode() . "<br>";
|
373 |
+
$clm24shipping_address = $clm24shipping_address . $countryName . "<br>";
|
374 |
+
$clm24shipping_address = $clm24shipping_address . "T : " .$shipingAddress->getTelephone() . "<br>";
|
375 |
+
}
|
376 |
+
|
377 |
+
$mailer->setTemplateParams(array(
|
378 |
+
'order' => $this,
|
379 |
+
'billing' => $this->getBillingAddress(),
|
380 |
+
'payment_html' => $paymentBlockHtml,
|
381 |
+
'shipping' => $clm24shipping_address,
|
382 |
+
'isship2myid' => $flag_ship2myid
|
383 |
+
));
|
384 |
+
|
385 |
+
|
386 |
+
/** @var $emailQueue Mage_Core_Model_Email_Queue */
|
387 |
+
$emailQueue = Mage::getModel('core/email_queue');
|
388 |
+
$emailQueue->setEntityId($this->getId())
|
389 |
+
->setEntityType(self::ENTITY)
|
390 |
+
->setEventType(self::EMAIL_EVENT_NAME_NEW_ORDER)
|
391 |
+
->setIsForceCheck(!$forceMode);
|
392 |
+
|
393 |
+
$mailer->setQueue($emailQueue)->send();
|
394 |
+
|
395 |
+
$this->setEmailSent(true);
|
396 |
+
$this->_getResource()->saveAttribute($this, 'email_sent');
|
397 |
+
|
398 |
+
return $this;
|
399 |
+
}
|
400 |
+
|
401 |
|
402 |
/**
|
403 |
* Retrieve order shipping address
|
519 |
return false;
|
520 |
}
|
521 |
|
522 |
+
|
523 |
/**
|
524 |
* Retun Ship2MyId Order firstname
|
525 |
*
|
app/code/local/Xclm24/Myidshipping/etc/config.xml
CHANGED
@@ -22,7 +22,7 @@
|
|
22 |
<config>
|
23 |
<modules>
|
24 |
<Xclm24_Myidshipping>
|
25 |
-
<version>1.
|
26 |
</Xclm24_Myidshipping>
|
27 |
</modules>
|
28 |
|
22 |
<config>
|
23 |
<modules>
|
24 |
<Xclm24_Myidshipping>
|
25 |
+
<version>1.4</version>
|
26 |
</Xclm24_Myidshipping>
|
27 |
</modules>
|
28 |
|
app/code/local/Xclm24/Myidshipping/etc/system.xml
CHANGED
@@ -38,7 +38,7 @@
|
|
38 |
<groups>
|
39 |
<clm24_notice translate="label" module="myidshipping">
|
40 |
<frontend_model>myidshipping/adminhtml_system_config_fieldset_hint</frontend_model>
|
41 |
-
<help_link>http://www.
|
42 |
<sort_order>0</sort_order>
|
43 |
<show_in_default>1</show_in_default>
|
44 |
<show_in_website>1</show_in_website>
|
38 |
<groups>
|
39 |
<clm24_notice translate="label" module="myidshipping">
|
40 |
<frontend_model>myidshipping/adminhtml_system_config_fieldset_hint</frontend_model>
|
41 |
+
<help_link>http://www.ship2myid.com/ship2myid-howitworks</help_link>
|
42 |
<sort_order>0</sort_order>
|
43 |
<show_in_default>1</show_in_default>
|
44 |
<show_in_website>1</show_in_website>
|
app/code/local/Xclm24/Myidshipping/sql/myidshipping_setup/upgrade-1.3-1.4.php
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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/frontend/base/default/template/myidshipping/myidshipping.phtml
CHANGED
@@ -19,6 +19,18 @@
|
|
19 |
*/
|
20 |
|
21 |
$base_url = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_SKIN);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
22 |
?>
|
23 |
|
24 |
<li class="control">
|
@@ -34,7 +46,7 @@ $base_url = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_SKIN);
|
|
34 |
<?php endif; ?>
|
35 |
</li>
|
36 |
|
37 |
-
<a title="MapMyID Address Book" style="display:none;" id="mapmyidbutton" params="lightwindow_width=<?php echo Mage::getStoreConfig('clm24core/shippings/clm24popwidth') ?>,lightwindow_height=<?php echo Mage::getStoreConfig('clm24core/shippings/clm24popheight') ?>,lightwindow_loading_animation=true" class="lightwindow page-options lightwindow_mapmyid" href="<?php echo
|
38 |
<script type="text/javascript">
|
39 |
$$('.use_mapmyid_label').invoke('observe', 'click', function() {
|
40 |
document.getElementById("billing:use_myid").checked = true;
|
19 |
*/
|
20 |
|
21 |
$base_url = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_SKIN);
|
22 |
+
$marketplace_details = Mage::Helper('myidshipping')->getMarketplaceDetails();
|
23 |
+
$popup_url = Mage::getStoreConfig('clm24core/shippings/clm24popurl'); // . '&callback=' . $this->getUrl('myidshipping/index/postback') . '&name=' . $marketplace_details['Marketplace']['marketplace_name'] ;
|
24 |
+
|
25 |
+
if(isset($marketplace_details['Marketplace']['marketplace_name']) && !empty($marketplace_details['Marketplace']['marketplace_name'])){
|
26 |
+
$popup_url .= '&name=' . urlencode($marketplace_details['Marketplace']['marketplace_name']);
|
27 |
+
}
|
28 |
+
if(isset($marketplace_details['Marketplace']['marketplace_image']) && !empty($marketplace_details['Marketplace']['marketplace_image'])){
|
29 |
+
$popup_url .= '&image=' . urlencode($marketplace_details['Marketplace']['marketplace_image']);
|
30 |
+
}
|
31 |
+
|
32 |
+
$popup_url .= '&callback=' . $this->getUrl('myidshipping/index/postback');
|
33 |
+
|
34 |
?>
|
35 |
|
36 |
<li class="control">
|
46 |
<?php endif; ?>
|
47 |
</li>
|
48 |
|
49 |
+
<a title="MapMyID Address Book" style="display:none;" id="mapmyidbutton" params="lightwindow_width=<?php echo Mage::getStoreConfig('clm24core/shippings/clm24popwidth') ?>,lightwindow_height=<?php echo Mage::getStoreConfig('clm24core/shippings/clm24popheight') ?>,lightwindow_loading_animation=true" class="lightwindow page-options lightwindow_mapmyid" href="<?php echo $popup_url; ?>">MapMyID Address Book</a>
|
50 |
<script type="text/javascript">
|
51 |
$$('.use_mapmyid_label').invoke('observe', 'click', function() {
|
52 |
document.getElementById("billing:use_myid").checked = true;
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Ship2MyID</name>
|
4 |
-
<version>1.
|
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="ebb0a27be9039dbb586562db543cf038"/></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="
|
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.0</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-07-17</date>
|
15 |
+
<time>05:56:32</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="ebb0a27be9039dbb586562db543cf038"/></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="4c9f7c56d09ab982c5e1b373a6928037"/></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="955ed7f2250da19738a384235fa573f2"/><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="013d0e1b76df285d634fd1c6246355df"/><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="fd316e9a4603238c71b47ea9c055f3b5"/><file name="system.xml" hash="705c7f81c8ff2bad597551092f4a2de5"/></dir><dir name="sql"><dir name="myidshipping_setup"><file name="install-1.0.php" hash="9e0deead946b0a95e6b4c776bf648347"/><file name="upgrade-1.0-1.1.php" hash="b91538bbe460fc3f976ea68a6cb4f46b"/><file name="upgrade-1.1-1.2.php" hash="b77a0fa06d18ccd398e67fbc5035dac7"/><file name="upgrade-1.2-1.3.php" hash="ec83d385a25010ec73eaeaf2086e7301"/><file name="upgrade-1.3-1.4.php" hash="ec1895f26b00eda74848723131da9df7"/></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="f40d501324c83aa8c597b58ae8d0b909"/></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="ad390424c018cc5397283c57edfbc93c"/><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="6a98ebee7f2885d727800aa42a753eea"/></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="abc1b91dd29e68fcf7e5c16a32399c09"/></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="backgroundlight.png" hash="e4fc8cd0afcac5d3fea984104e1ed048"/><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="1960e2b870bebf13c9958d7646db6839"/><file name="creditmemo_new_guest.html" hash="e6a713107c626f866458334fe55bb88e"/><file name="invoice_new.html" hash="9f434f2a0dda28458d10f417b7ddf092"/><file name="invoice_new_guest.html" hash="c52197c352d6ad1edf3c19e7a1cb3c78"/><file name="order_new.html" hash="883d051a7ebd14dcf3fa19c1e19223f1"/><file name="order_new_guest.html" hash="f49b5c28657c191659bdf1c31b1746df"/><file name="shipment_new.html" hash="91ea18c2c1c94a138f144ba4e808be30"/><file name="shipment_new_guest.html" hash="fdf66327005c9b4b6fef16e6c8faf285"/></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>
|