Version Notes
Fix some issues tracking order after payment of thirdparty like paypal,PU etc
Download this release
Release Info
| Developer | jitendra |
| Extension | Betaout |
| Version | 2.0.0 |
| Comparing to | |
| See all releases | |
Code changes from version 1.1.9 to 2.0.0
- app/code/community/Betaout/.DS_Store +0 -0
- app/code/community/Betaout/Amplify/.DS_Store +0 -0
- app/code/community/Betaout/Amplify/Model/Key.php +271 -143
- app/code/community/Betaout/Amplify/Model/Order.php +0 -12
- app/code/community/Betaout/Amplify/etc/config.xml +10 -15
- app/design/frontend/base/default/template/betaout_amplify/checkout.phtml +1 -1
- app/design/frontend/base/default/template/betaout_amplify/head.phtml +1 -1
- package.xml +6 -6
app/code/community/Betaout/.DS_Store
ADDED
|
Binary file
|
app/code/community/Betaout/Amplify/.DS_Store
ADDED
|
Binary file
|
app/code/community/Betaout/Amplify/Model/Key.php
CHANGED
|
@@ -38,7 +38,7 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 38 |
$this->key = Mage::getStoreConfig(self::XML_PATH_KEY);
|
| 39 |
$this->secret = Mage::getStoreConfig(self::XML_PATH_SECRET);
|
| 40 |
$this->projectId = Mage::getStoreConfig(self::XML_PATH_PROJECTID);
|
| 41 |
-
$this->verified =1
|
| 42 |
$this->amplify = new Amplify($this->key, $this->secret, $this->projectId);
|
| 43 |
$this->verified = 1;
|
| 44 |
$this->_process_date = Mage::getStoreConfig('betaout_amplify_options/settings/_process_date');
|
|
@@ -53,7 +53,7 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 53 |
}
|
| 54 |
|
| 55 |
public function getAmplifyCheckOrderStatus($observer) {
|
| 56 |
-
|
| 57 |
}
|
| 58 |
|
| 59 |
public function getAmplifyConfigChangeObserver($evnt) {
|
|
@@ -84,16 +84,15 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 84 |
// }
|
| 85 |
// }
|
| 86 |
//
|
| 87 |
-
|
| 88 |
}
|
| 89 |
|
| 90 |
public function getAmplifyEventRemoveFromCart(Varien_Event_Observer $observer) {
|
| 91 |
-
|
| 92 |
try {
|
| 93 |
if ($this->verified && is_object($observer)) {
|
| 94 |
-
|
| 95 |
$product = $observer->getEvent()->getQuote_item();
|
| 96 |
-
|
| 97 |
$actionData = array();
|
| 98 |
$actionData[0]['productId'] = $product->getProductId();
|
| 99 |
$actionData[0]['productTitle'] = $product->getName();
|
|
@@ -110,10 +109,10 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 110 |
$actionData[0]['qty'] = (int) $product->getQty();
|
| 111 |
$actionData[0]['category'] = "";
|
| 112 |
$actionData[0]['discount'] = abs($product->getPrice() - $product->getFinalPrice());
|
| 113 |
-
$subprice=(int) $product->getQty()
|
| 114 |
$cart = Mage::getSingleton('checkout/cart');
|
| 115 |
$subTotalPrice = $cart->getQuote()->getGrandTotal();
|
| 116 |
-
$orderInfo["subtotalPrice"] = $subTotalPrice
|
| 117 |
$actionDescription = array(
|
| 118 |
'action' => 'removed_from_cart',
|
| 119 |
'email' => $this->getCustomerIdentity(),
|
|
@@ -121,7 +120,6 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 121 |
'pd' => $actionData
|
| 122 |
);
|
| 123 |
$res = $this->amplify->customer_action($actionDescription);
|
| 124 |
-
|
| 125 |
}
|
| 126 |
} catch (Exception $ex) {
|
| 127 |
|
|
@@ -130,9 +128,9 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 130 |
|
| 131 |
public function getAmplifyEventAddToCart(Varien_Event_Observer $evnt) {
|
| 132 |
try {
|
| 133 |
-
|
| 134 |
if ($this->verified) {
|
| 135 |
-
|
| 136 |
$event = $evnt->getEvent();
|
| 137 |
$product = $event->getProduct();
|
| 138 |
$productId = $product->getId();
|
|
@@ -141,15 +139,15 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 141 |
$cateHolder = array();
|
| 142 |
foreach ($categs as $cat) {
|
| 143 |
$cateName = Mage::getModel('catalog/category')->load($cat['entity_id']);
|
| 144 |
-
$name
|
| 145 |
-
$id
|
| 146 |
-
$pid
|
| 147 |
-
if($pid==1){
|
| 148 |
-
$pid=0;
|
| 149 |
}
|
| 150 |
-
$cateHolder[$id] = array("n"
|
| 151 |
}
|
| 152 |
-
|
| 153 |
$productName = $product->getName();
|
| 154 |
$sku = $productName . "_" . $product->getSku();
|
| 155 |
$qty = $product->getPrice();
|
|
@@ -180,7 +178,7 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 180 |
$subTotalPrice = $cart->getQuote()->getGrandTotal();
|
| 181 |
$orderInfo["subtotalPrice"] = $subTotalPrice;
|
| 182 |
$orderInfo['abandonedCheckoutUrl'] = Mage::getUrl('checkout/cart');
|
| 183 |
-
$orderInfo['currency']=Mage::app()->getStore()->getBaseCurrencyCode();
|
| 184 |
$actionDescription = array(
|
| 185 |
'or' => $orderInfo,
|
| 186 |
'email' => $this->getCustomerIdentity(),
|
|
@@ -204,19 +202,19 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 204 |
$stock_data = $product->getIs_in_stock();
|
| 205 |
$catCollection = $product->getCategoryCollection();
|
| 206 |
$categs = $catCollection->exportToArray();
|
| 207 |
-
|
| 208 |
$cateHolder = array();
|
| 209 |
foreach ($categs as $cat) {
|
| 210 |
$cateName = Mage::getModel('catalog/category')->load($cat['entity_id']);
|
| 211 |
-
$name
|
| 212 |
-
$id
|
| 213 |
-
$pid
|
| 214 |
-
if($pid==1){
|
| 215 |
-
$pid=0;
|
| 216 |
}
|
| 217 |
-
$cateHolder[$id] = array("n"
|
| 218 |
}
|
| 219 |
-
|
| 220 |
$actionData = array();
|
| 221 |
$actionData[0]['productId'] = $product->getId();
|
| 222 |
$actionData[0]['productTitle'] = $product->getName();
|
|
@@ -247,7 +245,7 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 247 |
}
|
| 248 |
|
| 249 |
public function getAmplifyEventVote($evnt) {
|
| 250 |
-
|
| 251 |
}
|
| 252 |
|
| 253 |
public function getAmplifyEventCustomerLogout($evnt) {
|
|
@@ -305,7 +303,6 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 305 |
$person = array_filter($person);
|
| 306 |
$res = $this->amplify->update($email, $person);
|
| 307 |
}
|
| 308 |
-
|
| 309 |
}
|
| 310 |
} catch (Exception $ex) {
|
| 311 |
|
|
@@ -318,7 +315,7 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 318 |
|
| 319 |
$subscriber = $evnt->getEvent()->getSubscriber();
|
| 320 |
$this->amplify->identify($subscriber->subscriber_email);
|
| 321 |
-
|
| 322 |
if ($subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED) {
|
| 323 |
|
| 324 |
$this->event('subscribed_to_newsletter', array('action' => 'subscribed_to_newsletter'));
|
|
@@ -346,8 +343,7 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 346 |
$email = base64_decode(Mage::getModel('core/cookie')->get('_ampEm'));
|
| 347 |
}
|
| 348 |
if ($true)
|
| 349 |
-
|
| 350 |
-
return $email;
|
| 351 |
} catch (Exception $ex) {
|
| 352 |
|
| 353 |
}
|
|
@@ -364,7 +360,7 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 364 |
}
|
| 365 |
|
| 366 |
public function getamplifyEventCustomerSave($evnt) {
|
| 367 |
-
|
| 368 |
}
|
| 369 |
|
| 370 |
public function getCustomereventInfo($customer) {
|
|
@@ -386,7 +382,7 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 386 |
}
|
| 387 |
|
| 388 |
public function eventCustomerFromCheckout($evnt) {
|
| 389 |
-
|
| 390 |
}
|
| 391 |
|
| 392 |
public function getAmplifyEventCustomerRegisterSuccess($evnt) {
|
|
@@ -447,11 +443,11 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 447 |
}
|
| 448 |
|
| 449 |
public function eventPerson($person, $additional = array()) {
|
| 450 |
-
|
| 451 |
}
|
| 452 |
|
| 453 |
public function event_revenue($identifier, $revenue) {
|
| 454 |
-
|
| 455 |
}
|
| 456 |
|
| 457 |
public function getAmplifyEventWishlist($evnt) {
|
|
@@ -468,14 +464,14 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 468 |
$catCollection = $product->getCategoryCollection();
|
| 469 |
$categs = $catCollection->exportToArray();
|
| 470 |
$cateHolder = array();
|
| 471 |
-
|
| 472 |
-
|
| 473 |
$cateName = Mage::getModel('catalog/category')->load($cat['entity_id']);
|
| 474 |
-
$name
|
| 475 |
-
$id
|
| 476 |
-
$pid
|
| 477 |
-
$cateHolder[$id] = array("n"
|
| 478 |
-
|
| 479 |
$wishList = Mage::getSingleton('wishlist/wishlist')->loadByCustomer($customer);
|
| 480 |
$wishListItemCollection = $wishList->getItemCollection();
|
| 481 |
if (count($wishListItemCollection)) {
|
|
@@ -534,48 +530,47 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 534 |
try {
|
| 535 |
if ($this->verified) {
|
| 536 |
|
| 537 |
-
$
|
| 538 |
-
$
|
| 539 |
-
|
| 540 |
|
|
|
|
|
|
|
|
|
|
| 541 |
$customerAddressId = Mage::getSingleton('customer/session')->getCustomer()->getDefaultShipping();
|
| 542 |
if ($customerAddressId) {
|
| 543 |
-
|
| 544 |
|
| 545 |
if (is_object($customer)) {
|
| 546 |
$person['firstname'] = $customer->getFirstname();
|
| 547 |
$person['lastname'] = $customer->getLastname();
|
| 548 |
-
|
| 549 |
$person['postcode'] = $customer->getPostcode();
|
| 550 |
$person['telephone'] = $customer->getTelephone();
|
| 551 |
$person['fax'] = $customer->getfax();
|
| 552 |
$person['customerId'] = $customer->getCustomerId();
|
| 553 |
$person['company'] = $customer->getCompany();
|
| 554 |
-
// $person['region'] = $customer->getRegion();
|
| 555 |
$person['street'] = $customer->getStreetFull();
|
| 556 |
}
|
| 557 |
$person = array_filter($person);
|
|
|
|
| 558 |
$res = $this->amplify->update($email, $person);
|
| 559 |
} else {
|
| 560 |
$customer = $order->getShippingAddress();
|
| 561 |
if (is_object($customer)) {
|
| 562 |
$person['firstname'] = $customer->getFirstname();
|
| 563 |
$person['lastname'] = $customer->getLastname();
|
| 564 |
-
|
| 565 |
$person['postcode'] = $customer->getPostcode();
|
| 566 |
$person['telephone'] = $customer->getTelephone();
|
| 567 |
$person['fax'] = $customer->getfax();
|
| 568 |
$person['customerId'] = $customer->getCustomerId();
|
| 569 |
$person['company'] = $customer->getCompany();
|
| 570 |
-
// $person['region'] = $customer->getRegion();
|
| 571 |
$person['street'] = $customer->getStreetFull();
|
|
|
|
| 572 |
}
|
| 573 |
}
|
| 574 |
|
| 575 |
-
|
| 576 |
-
|
| 577 |
$items = $order->getAllVisibleItems();
|
| 578 |
-
|
| 579 |
$itemcount = count($items);
|
| 580 |
$name = array();
|
| 581 |
$unitPrice = array();
|
|
@@ -586,23 +581,23 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 586 |
$actionData = array();
|
| 587 |
|
| 588 |
foreach ($items as $itemId => $item) {
|
| 589 |
-
|
| 590 |
-
|
| 591 |
$product = Mage::getModel('catalog/product')->load($product->getProductId());
|
| 592 |
$categoryIds = $product->getCategoryIds();
|
| 593 |
$cateHolder = array();
|
| 594 |
-
|
| 595 |
foreach ($categoryIds as $cat) {
|
| 596 |
-
|
| 597 |
-
|
| 598 |
-
|
| 599 |
-
|
| 600 |
-
|
| 601 |
-
|
|
|
|
|
|
|
| 602 |
}
|
| 603 |
-
|
| 604 |
-
}
|
| 605 |
-
|
| 606 |
$actionData[$i]['productId'] = $product->getId();
|
| 607 |
$actionData[$i]['productTitle'] = $product->getName();
|
| 608 |
$actionData[$i]['sku'] = $product->getSku();
|
|
@@ -620,8 +615,7 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 620 |
$actionData[$i]['qty'] = (int) $item->getQtyOrdered();
|
| 621 |
$actionData[$i]['category'] = $cateHolder;
|
| 622 |
$actionData[$i]['orderId'] = $order_id;
|
| 623 |
-
$actionData[$i]['totalProductPrice']
|
| 624 |
-
// $actionData[$i]['couponCode'] = Mage::getSingleton('checkout/session')->getQuote()->getCouponCode() ;
|
| 625 |
$actionData[$i]['discountPrice'] = $item->getDiscountAmount();
|
| 626 |
$i++;
|
| 627 |
}
|
|
@@ -631,10 +625,10 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 631 |
$totalShippingPrice = $order->getShippingAmount();
|
| 632 |
$TotalPrice = $TotalPrice;
|
| 633 |
$subTotalPrice = $order->getSubtotal();
|
| 634 |
-
$orderInfo["subtotalPrice"] = $subTotalPrice-abs($order->getDiscountAmount());
|
| 635 |
$orderInfo["totalPrice"] = $TotalPrice;
|
| 636 |
$orderInfo["totalShippingPrice"] = $totalShippingPrice;
|
| 637 |
-
$orderInfo['orderId'] = $
|
| 638 |
$orderInfo['promocode'] = $order->getCouponCode();
|
| 639 |
$orderInfo['totalDiscount'] = abs($order->getDiscountAmount());
|
| 640 |
$orderInfo['DiscountPer'] = abs($order->getDiscountPercent());
|
|
@@ -643,27 +637,160 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 643 |
$orderInfo['financialStatus'] = 'paid';
|
| 644 |
$orderInfo['abandonedCheckoutUrl'] = Mage::getUrl('checkout/cart');
|
| 645 |
$orderInfo['totalTaxes'] = $order->getShippingTaxAmount();
|
|
|
|
|
|
|
|
|
|
| 646 |
|
| 647 |
-
// $orderInfo['totalQty'] = $order->totalQty();
|
| 648 |
$actionDescription = array(
|
| 649 |
'action' => 'purchased',
|
| 650 |
-
'email' => $
|
| 651 |
'or' => $orderInfo,
|
| 652 |
'pd' => $actionData
|
| 653 |
);
|
| 654 |
-
|
| 655 |
-
$res = $this->amplify->customer_action($actionDescription);
|
| 656 |
-
|
| 657 |
}
|
| 658 |
} catch (Exception $ex) {
|
| 659 |
-
|
| 660 |
}
|
| 661 |
}
|
| 662 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 663 |
public function getAmplify_checkout_allow_guest($evnt) {
|
| 664 |
try {
|
| 665 |
if ($this->verified) {
|
| 666 |
-
|
| 667 |
$getquote = $evnt->getQuote();
|
| 668 |
$data = array_filter($getquote->getData());
|
| 669 |
Mage::getModel('core/cookie')->set('amplify_email', $data['customer_email']);
|
|
@@ -679,13 +806,13 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 679 |
}
|
| 680 |
}
|
| 681 |
|
| 682 |
-
|
| 683 |
-
|
| 684 |
-
|
| 685 |
|
| 686 |
public function getAmplifyCatalog_product_delete_after_done($evnt) {
|
| 687 |
-
|
| 688 |
-
|
| 689 |
|
| 690 |
public function getAmplifyCatalogProductView(Varien_Event_Observer $evnt) {
|
| 691 |
try {
|
|
@@ -693,21 +820,21 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 693 |
|
| 694 |
$product = $evnt->getEvent()->getProduct();
|
| 695 |
$catCollection = $product->getCategoryCollection();
|
| 696 |
-
|
| 697 |
$categs = $catCollection->exportToArray();
|
| 698 |
$cateHolder = array();
|
| 699 |
foreach ($categs as $cat) {
|
| 700 |
$cateName = Mage::getModel('catalog/category')->load($cat['entity_id']);
|
| 701 |
-
$name
|
| 702 |
-
$id
|
| 703 |
-
$pid
|
| 704 |
-
if($pid==1){
|
| 705 |
-
$pid=0;
|
| 706 |
}
|
| 707 |
-
$cateHolder[$id] = array("n"
|
| 708 |
}
|
| 709 |
-
|
| 710 |
-
|
| 711 |
$event = $evnt->getEvent();
|
| 712 |
$action = $event->getControllerAction();
|
| 713 |
$stock_data = $product->getIs_in_stock();
|
|
@@ -733,31 +860,32 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 733 |
"email" => $this->getCustomerIdentity(),
|
| 734 |
'pd' => $actionData
|
| 735 |
);
|
| 736 |
-
|
| 737 |
$res = $this->amplify->customer_action($actionDescription);
|
| 738 |
-
|
| 739 |
}
|
| 740 |
} catch (Exception $ex) {
|
| 741 |
|
| 742 |
}
|
| 743 |
}
|
| 744 |
|
| 745 |
-
|
|
|
|
|
|
|
| 746 |
|
| 747 |
-
}
|
| 748 |
public function getAmplifySendfriendProduct(Varien_Event_Observer $evnt) {
|
| 749 |
-
|
| 750 |
}
|
| 751 |
|
| 752 |
public function catalogProductCompareAddProduct(Varien_Event_Observer $evnt) {
|
| 753 |
-
|
| 754 |
}
|
|
|
|
| 755 |
public function getAmplifyCustomerAdressSaveAfter($evnt) {
|
| 756 |
-
|
| 757 |
}
|
| 758 |
|
| 759 |
public function getAmplifySales_order_save_commit_after($observer) {
|
| 760 |
-
|
| 761 |
}
|
| 762 |
|
| 763 |
/**
|
|
@@ -768,58 +896,57 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 768 |
public function getAmplify_cartUpdate(Varien_Event_Observer $observer) {
|
| 769 |
try {
|
| 770 |
if ($this->verified) {
|
| 771 |
-
|
| 772 |
-
|
| 773 |
-
|
| 774 |
-
|
| 775 |
-
|
| 776 |
-
|
| 777 |
-
|
| 778 |
-
|
| 779 |
-
|
| 780 |
-
|
| 781 |
-
|
| 782 |
-
|
| 783 |
-
|
| 784 |
-
|
| 785 |
-
|
| 786 |
-
|
| 787 |
-
|
| 788 |
-
|
| 789 |
-
|
| 790 |
-
|
| 791 |
-
|
| 792 |
-
|
| 793 |
-
|
| 794 |
-
|
| 795 |
-
|
| 796 |
-
|
| 797 |
-
|
| 798 |
-
|
| 799 |
-
|
| 800 |
-
|
| 801 |
-
|
| 802 |
-
|
| 803 |
-
|
| 804 |
-
|
| 805 |
-
|
| 806 |
-
|
|
|
|
| 807 |
}
|
| 808 |
-
}
|
| 809 |
$cart = Mage::getSingleton('checkout/cart');
|
| 810 |
$subTotalPrice = $cart->getQuote()->getGrandTotal();
|
| 811 |
-
$orderInfo["subtotalPrice"] = $subTotalPrice
|
| 812 |
$orderInfo['abandonedCheckoutUrl'] = Mage::getUrl('checkout/cart');
|
| 813 |
-
$orderInfo['currency']=Mage::app()->getStore()->getBaseCurrencyCode();
|
| 814 |
$actionDescription = array(
|
| 815 |
'or' => $orderInfo,
|
| 816 |
'email' => $this->getCustomerIdentity(),
|
| 817 |
'action' => 'update_cart',
|
| 818 |
'pd' => $actionData
|
| 819 |
);
|
| 820 |
-
|
| 821 |
-
|
| 822 |
-
|
| 823 |
}
|
| 824 |
} catch (Exception $ex) {
|
| 825 |
|
|
@@ -827,10 +954,11 @@ class Betaout_Amplify_Model_Key extends Mage_Core_Model_Abstract {
|
|
| 827 |
}
|
| 828 |
|
| 829 |
public function getAmplifyCancelOrderItem($observer) {
|
| 830 |
-
|
| 831 |
}
|
| 832 |
|
| 833 |
public function sendData() {
|
|
|
|
| 834 |
}
|
| 835 |
|
| 836 |
-
}
|
| 38 |
$this->key = Mage::getStoreConfig(self::XML_PATH_KEY);
|
| 39 |
$this->secret = Mage::getStoreConfig(self::XML_PATH_SECRET);
|
| 40 |
$this->projectId = Mage::getStoreConfig(self::XML_PATH_PROJECTID);
|
| 41 |
+
$this->verified = 1; // Mage::getStoreConfig('betaout_amplify_options/settings/amplify_verified');
|
| 42 |
$this->amplify = new Amplify($this->key, $this->secret, $this->projectId);
|
| 43 |
$this->verified = 1;
|
| 44 |
$this->_process_date = Mage::getStoreConfig('betaout_amplify_options/settings/_process_date');
|
| 53 |
}
|
| 54 |
|
| 55 |
public function getAmplifyCheckOrderStatus($observer) {
|
| 56 |
+
|
| 57 |
}
|
| 58 |
|
| 59 |
public function getAmplifyConfigChangeObserver($evnt) {
|
| 84 |
// }
|
| 85 |
// }
|
| 86 |
//
|
|
|
|
| 87 |
}
|
| 88 |
|
| 89 |
public function getAmplifyEventRemoveFromCart(Varien_Event_Observer $observer) {
|
| 90 |
+
|
| 91 |
try {
|
| 92 |
if ($this->verified && is_object($observer)) {
|
| 93 |
+
|
| 94 |
$product = $observer->getEvent()->getQuote_item();
|
| 95 |
+
|
| 96 |
$actionData = array();
|
| 97 |
$actionData[0]['productId'] = $product->getProductId();
|
| 98 |
$actionData[0]['productTitle'] = $product->getName();
|
| 109 |
$actionData[0]['qty'] = (int) $product->getQty();
|
| 110 |
$actionData[0]['category'] = "";
|
| 111 |
$actionData[0]['discount'] = abs($product->getPrice() - $product->getFinalPrice());
|
| 112 |
+
$subprice = (int) $product->getQty() * $product->getPrice();
|
| 113 |
$cart = Mage::getSingleton('checkout/cart');
|
| 114 |
$subTotalPrice = $cart->getQuote()->getGrandTotal();
|
| 115 |
+
$orderInfo["subtotalPrice"] = $subTotalPrice - $subprice;
|
| 116 |
$actionDescription = array(
|
| 117 |
'action' => 'removed_from_cart',
|
| 118 |
'email' => $this->getCustomerIdentity(),
|
| 120 |
'pd' => $actionData
|
| 121 |
);
|
| 122 |
$res = $this->amplify->customer_action($actionDescription);
|
|
|
|
| 123 |
}
|
| 124 |
} catch (Exception $ex) {
|
| 125 |
|
| 128 |
|
| 129 |
public function getAmplifyEventAddToCart(Varien_Event_Observer $evnt) {
|
| 130 |
try {
|
| 131 |
+
|
| 132 |
if ($this->verified) {
|
| 133 |
+
|
| 134 |
$event = $evnt->getEvent();
|
| 135 |
$product = $event->getProduct();
|
| 136 |
$productId = $product->getId();
|
| 139 |
$cateHolder = array();
|
| 140 |
foreach ($categs as $cat) {
|
| 141 |
$cateName = Mage::getModel('catalog/category')->load($cat['entity_id']);
|
| 142 |
+
$name = $cateName->getName();
|
| 143 |
+
$id = $cateName->getEntityId();
|
| 144 |
+
$pid = $cateName->getParent_id();
|
| 145 |
+
if ($pid == 1) {
|
| 146 |
+
$pid = 0;
|
| 147 |
}
|
| 148 |
+
$cateHolder[$id] = array("n" => $name, "p" => $pid);
|
| 149 |
}
|
| 150 |
+
|
| 151 |
$productName = $product->getName();
|
| 152 |
$sku = $productName . "_" . $product->getSku();
|
| 153 |
$qty = $product->getPrice();
|
| 178 |
$subTotalPrice = $cart->getQuote()->getGrandTotal();
|
| 179 |
$orderInfo["subtotalPrice"] = $subTotalPrice;
|
| 180 |
$orderInfo['abandonedCheckoutUrl'] = Mage::getUrl('checkout/cart');
|
| 181 |
+
$orderInfo['currency'] = Mage::app()->getStore()->getBaseCurrencyCode();
|
| 182 |
$actionDescription = array(
|
| 183 |
'or' => $orderInfo,
|
| 184 |
'email' => $this->getCustomerIdentity(),
|
| 202 |
$stock_data = $product->getIs_in_stock();
|
| 203 |
$catCollection = $product->getCategoryCollection();
|
| 204 |
$categs = $catCollection->exportToArray();
|
| 205 |
+
|
| 206 |
$cateHolder = array();
|
| 207 |
foreach ($categs as $cat) {
|
| 208 |
$cateName = Mage::getModel('catalog/category')->load($cat['entity_id']);
|
| 209 |
+
$name = $cateName->getName();
|
| 210 |
+
$id = $cateName->getEntityId();
|
| 211 |
+
$pid = $cateName->getParent_id();
|
| 212 |
+
if ($pid == 1) {
|
| 213 |
+
$pid = 0;
|
| 214 |
}
|
| 215 |
+
$cateHolder[$id] = array("n" => $name, "p" => $pid);
|
| 216 |
}
|
| 217 |
+
|
| 218 |
$actionData = array();
|
| 219 |
$actionData[0]['productId'] = $product->getId();
|
| 220 |
$actionData[0]['productTitle'] = $product->getName();
|
| 245 |
}
|
| 246 |
|
| 247 |
public function getAmplifyEventVote($evnt) {
|
| 248 |
+
|
| 249 |
}
|
| 250 |
|
| 251 |
public function getAmplifyEventCustomerLogout($evnt) {
|
| 303 |
$person = array_filter($person);
|
| 304 |
$res = $this->amplify->update($email, $person);
|
| 305 |
}
|
|
|
|
| 306 |
}
|
| 307 |
} catch (Exception $ex) {
|
| 308 |
|
| 315 |
|
| 316 |
$subscriber = $evnt->getEvent()->getSubscriber();
|
| 317 |
$this->amplify->identify($subscriber->subscriber_email);
|
| 318 |
+
|
| 319 |
if ($subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED) {
|
| 320 |
|
| 321 |
$this->event('subscribed_to_newsletter', array('action' => 'subscribed_to_newsletter'));
|
| 343 |
$email = base64_decode(Mage::getModel('core/cookie')->get('_ampEm'));
|
| 344 |
}
|
| 345 |
if ($true)
|
| 346 |
+
return $email;
|
|
|
|
| 347 |
} catch (Exception $ex) {
|
| 348 |
|
| 349 |
}
|
| 360 |
}
|
| 361 |
|
| 362 |
public function getamplifyEventCustomerSave($evnt) {
|
| 363 |
+
|
| 364 |
}
|
| 365 |
|
| 366 |
public function getCustomereventInfo($customer) {
|
| 382 |
}
|
| 383 |
|
| 384 |
public function eventCustomerFromCheckout($evnt) {
|
| 385 |
+
|
| 386 |
}
|
| 387 |
|
| 388 |
public function getAmplifyEventCustomerRegisterSuccess($evnt) {
|
| 443 |
}
|
| 444 |
|
| 445 |
public function eventPerson($person, $additional = array()) {
|
| 446 |
+
|
| 447 |
}
|
| 448 |
|
| 449 |
public function event_revenue($identifier, $revenue) {
|
| 450 |
+
|
| 451 |
}
|
| 452 |
|
| 453 |
public function getAmplifyEventWishlist($evnt) {
|
| 464 |
$catCollection = $product->getCategoryCollection();
|
| 465 |
$categs = $catCollection->exportToArray();
|
| 466 |
$cateHolder = array();
|
| 467 |
+
|
| 468 |
+
foreach ($categs as $cat) {
|
| 469 |
$cateName = Mage::getModel('catalog/category')->load($cat['entity_id']);
|
| 470 |
+
$name = $cateName->getName();
|
| 471 |
+
$id = $cateName->getEntityId();
|
| 472 |
+
$pid = $cateName->getParent_id();
|
| 473 |
+
$cateHolder[$id] = array("n" => $name, "p" => $pid);
|
| 474 |
+
}
|
| 475 |
$wishList = Mage::getSingleton('wishlist/wishlist')->loadByCustomer($customer);
|
| 476 |
$wishListItemCollection = $wishList->getItemCollection();
|
| 477 |
if (count($wishListItemCollection)) {
|
| 530 |
try {
|
| 531 |
if ($this->verified) {
|
| 532 |
|
| 533 |
+
$orderdata = $evnt->getData('order_ids');
|
| 534 |
+
$order_idn = $orderdata[0];
|
|
|
|
| 535 |
|
| 536 |
+
$order = Mage::getModel("sales/order")->load($order_idn);
|
| 537 |
+
$order_id = $order->getIncrementId();
|
| 538 |
+
$person = array();
|
| 539 |
$customerAddressId = Mage::getSingleton('customer/session')->getCustomer()->getDefaultShipping();
|
| 540 |
if ($customerAddressId) {
|
| 541 |
+
$customer = $order->getShippingAddress();
|
| 542 |
|
| 543 |
if (is_object($customer)) {
|
| 544 |
$person['firstname'] = $customer->getFirstname();
|
| 545 |
$person['lastname'] = $customer->getLastname();
|
| 546 |
+
$person['email'] = $customer->getEmail();
|
| 547 |
$person['postcode'] = $customer->getPostcode();
|
| 548 |
$person['telephone'] = $customer->getTelephone();
|
| 549 |
$person['fax'] = $customer->getfax();
|
| 550 |
$person['customerId'] = $customer->getCustomerId();
|
| 551 |
$person['company'] = $customer->getCompany();
|
|
|
|
| 552 |
$person['street'] = $customer->getStreetFull();
|
| 553 |
}
|
| 554 |
$person = array_filter($person);
|
| 555 |
+
$this->amplify->identify($person['email'], $person['firstname']);
|
| 556 |
$res = $this->amplify->update($email, $person);
|
| 557 |
} else {
|
| 558 |
$customer = $order->getShippingAddress();
|
| 559 |
if (is_object($customer)) {
|
| 560 |
$person['firstname'] = $customer->getFirstname();
|
| 561 |
$person['lastname'] = $customer->getLastname();
|
| 562 |
+
$person['email'] = $customer->getEmail();
|
| 563 |
$person['postcode'] = $customer->getPostcode();
|
| 564 |
$person['telephone'] = $customer->getTelephone();
|
| 565 |
$person['fax'] = $customer->getfax();
|
| 566 |
$person['customerId'] = $customer->getCustomerId();
|
| 567 |
$person['company'] = $customer->getCompany();
|
|
|
|
| 568 |
$person['street'] = $customer->getStreetFull();
|
| 569 |
+
$this->amplify->identify($person['email'], $person['firstname']);
|
| 570 |
}
|
| 571 |
}
|
| 572 |
|
|
|
|
|
|
|
| 573 |
$items = $order->getAllVisibleItems();
|
|
|
|
| 574 |
$itemcount = count($items);
|
| 575 |
$name = array();
|
| 576 |
$unitPrice = array();
|
| 581 |
$actionData = array();
|
| 582 |
|
| 583 |
foreach ($items as $itemId => $item) {
|
| 584 |
+
$product = $item;
|
| 585 |
+
|
| 586 |
$product = Mage::getModel('catalog/product')->load($product->getProductId());
|
| 587 |
$categoryIds = $product->getCategoryIds();
|
| 588 |
$cateHolder = array();
|
| 589 |
+
|
| 590 |
foreach ($categoryIds as $cat) {
|
| 591 |
+
$cateName = Mage::getModel('catalog/category')->load($cat['entity_id']);
|
| 592 |
+
$name = $cateName->getName();
|
| 593 |
+
$id = $cateName->getEntityId();
|
| 594 |
+
$pid = $cateName->getParent_id();
|
| 595 |
+
if ($pid == 1) {
|
| 596 |
+
$pid = 0;
|
| 597 |
+
}
|
| 598 |
+
$cateHolder[$id] = array("n" => $name, "p" => $pid);
|
| 599 |
}
|
| 600 |
+
|
|
|
|
|
|
|
| 601 |
$actionData[$i]['productId'] = $product->getId();
|
| 602 |
$actionData[$i]['productTitle'] = $product->getName();
|
| 603 |
$actionData[$i]['sku'] = $product->getSku();
|
| 615 |
$actionData[$i]['qty'] = (int) $item->getQtyOrdered();
|
| 616 |
$actionData[$i]['category'] = $cateHolder;
|
| 617 |
$actionData[$i]['orderId'] = $order_id;
|
| 618 |
+
$actionData[$i]['totalProductPrice'] = $item->getRowTotal() - $item->getDiscountAmount();
|
|
|
|
| 619 |
$actionData[$i]['discountPrice'] = $item->getDiscountAmount();
|
| 620 |
$i++;
|
| 621 |
}
|
| 625 |
$totalShippingPrice = $order->getShippingAmount();
|
| 626 |
$TotalPrice = $TotalPrice;
|
| 627 |
$subTotalPrice = $order->getSubtotal();
|
| 628 |
+
$orderInfo["subtotalPrice"] = $subTotalPrice - abs($order->getDiscountAmount());
|
| 629 |
$orderInfo["totalPrice"] = $TotalPrice;
|
| 630 |
$orderInfo["totalShippingPrice"] = $totalShippingPrice;
|
| 631 |
+
$orderInfo['orderId'] = $order->getIncrementId();
|
| 632 |
$orderInfo['promocode'] = $order->getCouponCode();
|
| 633 |
$orderInfo['totalDiscount'] = abs($order->getDiscountAmount());
|
| 634 |
$orderInfo['DiscountPer'] = abs($order->getDiscountPercent());
|
| 637 |
$orderInfo['financialStatus'] = 'paid';
|
| 638 |
$orderInfo['abandonedCheckoutUrl'] = Mage::getUrl('checkout/cart');
|
| 639 |
$orderInfo['totalTaxes'] = $order->getShippingTaxAmount();
|
| 640 |
+
$orderInfo['paymentType'] = $order->getPayment()->getMethodInstance()->getCode();
|
| 641 |
+
|
| 642 |
+
$cemail = $person['email'];
|
| 643 |
|
|
|
|
| 644 |
$actionDescription = array(
|
| 645 |
'action' => 'purchased',
|
| 646 |
+
'email' => $cemail,
|
| 647 |
'or' => $orderInfo,
|
| 648 |
'pd' => $actionData
|
| 649 |
);
|
| 650 |
+
$res = $this->amplify->customer_action($actionDescription);
|
|
|
|
|
|
|
| 651 |
}
|
| 652 |
} catch (Exception $ex) {
|
| 653 |
+
$this->event('error_one');
|
| 654 |
}
|
| 655 |
}
|
| 656 |
|
| 657 |
+
public function getAmplifyOrderSaveSuccess(Varien_Event_Observer $evnt) {
|
| 658 |
+
// try {
|
| 659 |
+
// if ($this->verified) {
|
| 660 |
+
// $order_id = $evnt->getEvent()->getOrder()->getId() ;
|
| 661 |
+
// $order_no = $evnt->getEvent()->getOrder()->getIncrementId() ;
|
| 662 |
+
// $order = Mage::getModel("sales/order")->load($order_id);
|
| 663 |
+
// $person=array();
|
| 664 |
+
// $paymentmethod=$order->getPayment()->getMethodInstance()->getCode();
|
| 665 |
+
// $orderstatus=$order->getStatusLabel();
|
| 666 |
+
// if(($paymentmethod=="payucheckout_shared" && $orderstatus!="Pending") || $paymentmethod=="cashondelivery"){
|
| 667 |
+
// $customerAddressId = Mage::getSingleton('customer/session')->getCustomer()->getDefaultShipping();
|
| 668 |
+
// if ($customerAddressId) {
|
| 669 |
+
// $customer = $order->getShippingAddress();
|
| 670 |
+
//
|
| 671 |
+
// if (is_object($customer)) {
|
| 672 |
+
// $person['firstname'] = $customer->getFirstname();
|
| 673 |
+
// $person['lastname'] = $customer->getLastname();
|
| 674 |
+
// $person['email']=$customer->getEmail();
|
| 675 |
+
// $person['postcode'] = $customer->getPostcode();
|
| 676 |
+
// $person['telephone'] = $customer->getTelephone();
|
| 677 |
+
// $person['fax'] = $customer->getfax();
|
| 678 |
+
// $person['customerId'] = $customer->getCustomerId();
|
| 679 |
+
// $person['company'] = $customer->getCompany();
|
| 680 |
+
// $person['street'] = $customer->getStreetFull();
|
| 681 |
+
// }
|
| 682 |
+
// $person = array_filter($person);
|
| 683 |
+
// $this->amplify->identify($person['email'], $person['firstname']);
|
| 684 |
+
// $res = $this->amplify->update($email, $person);
|
| 685 |
+
// } else {
|
| 686 |
+
// $customer = $order->getShippingAddress();
|
| 687 |
+
// if (is_object($customer)) {
|
| 688 |
+
// $person['firstname'] = $customer->getFirstname();
|
| 689 |
+
// $person['lastname'] = $customer->getLastname();
|
| 690 |
+
// $person['email']=$customer->getEmail();
|
| 691 |
+
// $person['postcode'] = $customer->getPostcode();
|
| 692 |
+
// $person['telephone'] = $customer->getTelephone();
|
| 693 |
+
// $person['fax'] = $customer->getfax();
|
| 694 |
+
// $person['customerId'] = $customer->getCustomerId();
|
| 695 |
+
// $person['company'] = $customer->getCompany();
|
| 696 |
+
// $person['street'] = $customer->getStreetFull();
|
| 697 |
+
// $this->amplify->identify($person['email'], $person['firstname']);
|
| 698 |
+
// }
|
| 699 |
+
// }
|
| 700 |
+
// $items = $order->getAllVisibleItems();
|
| 701 |
+
// $itemcount = count($items);
|
| 702 |
+
// $name = array();
|
| 703 |
+
// $unitPrice = array();
|
| 704 |
+
// $sku = array();
|
| 705 |
+
// $ids = array();
|
| 706 |
+
// $qty = array();
|
| 707 |
+
// $i = 0;
|
| 708 |
+
// $actionData = array();
|
| 709 |
+
//
|
| 710 |
+
// foreach ($items as $itemId => $item) {
|
| 711 |
+
// $product = $item;
|
| 712 |
+
//
|
| 713 |
+
// $product = Mage::getModel('catalog/product')->load($product->getProductId());
|
| 714 |
+
// $categoryIds = $product->getCategoryIds();
|
| 715 |
+
// $cateHolder = array();
|
| 716 |
+
//
|
| 717 |
+
// foreach ($categoryIds as $cat) {
|
| 718 |
+
// $cateName = Mage::getModel('catalog/category')->load($cat['entity_id']);
|
| 719 |
+
// $name=$cateName->getName();
|
| 720 |
+
// $id=$cateName->getEntityId();
|
| 721 |
+
// $pid=$cateName->getParent_id();
|
| 722 |
+
// if($pid==1){
|
| 723 |
+
// $pid=0;
|
| 724 |
+
// }
|
| 725 |
+
// $cateHolder[$id] = array("n"=>$name,"p"=>$pid);
|
| 726 |
+
// }
|
| 727 |
+
//
|
| 728 |
+
// $actionData[$i]['productId'] = $product->getId();
|
| 729 |
+
// $actionData[$i]['productTitle'] = $product->getName();
|
| 730 |
+
// $actionData[$i]['sku'] = $product->getSku();
|
| 731 |
+
// $actionData[$i]['price'] = $product->getPrice();
|
| 732 |
+
// $actionData[$i]['currency'] = Mage::app()->getStore()->getBaseCurrencyCode();
|
| 733 |
+
// $actionData[$i]['specialPrice'] = $product->getFinalPrice();
|
| 734 |
+
// $actionData[$i]['status'] = $product->getStatus();
|
| 735 |
+
// $actionData[$i]['productPictureUrl'] = $product->getImageUrl();
|
| 736 |
+
// $actionData[$i]['pageUrl'] = $product->getProductUrl();
|
| 737 |
+
// $actionData[$i]['weight'] = $product->getWeight();
|
| 738 |
+
// $actionData[$i]['stockAvailability'] = $stock_data ? $stock_data : 2;
|
| 739 |
+
// $actionData[$i]['size'] = $product->getResource()->getAttribute('size') ? $product->getAttributeText('size') : false;
|
| 740 |
+
// $actionData[$i]['color'] = $product->getResource()->getAttribute('color') ? $product->getAttributeText('color') : false;
|
| 741 |
+
// $actionData[$i]['brandName'] = $product->getResource()->getAttribute('manufacturer') ? $product->getAttributeText('manufacturer') : false;
|
| 742 |
+
// $actionData[$i]['qty'] = (int) $item->getQtyOrdered();
|
| 743 |
+
// $actionData[$i]['category'] = $cateHolder;
|
| 744 |
+
// $actionData[$i]['orderId'] = $order_no;
|
| 745 |
+
// $actionData[$i]['totalProductPrice']=$item->getRowTotal()-$item->getDiscountAmount();
|
| 746 |
+
// $actionData[$i]['discountPrice'] = $item->getDiscountAmount();
|
| 747 |
+
// $i++;
|
| 748 |
+
// }
|
| 749 |
+
//
|
| 750 |
+
// $cart = Mage::getSingleton('checkout/cart');
|
| 751 |
+
// $TotalPrice = $order->getGrandTotal();
|
| 752 |
+
// $totalShippingPrice = $order->getShippingAmount();
|
| 753 |
+
// $TotalPrice = $TotalPrice;
|
| 754 |
+
// $subTotalPrice = $order->getSubtotal();
|
| 755 |
+
// $orderInfo["subtotalPrice"] = $subTotalPrice-abs($order->getDiscountAmount());
|
| 756 |
+
// $orderInfo["totalPrice"] = $TotalPrice;
|
| 757 |
+
// $orderInfo["totalShippingPrice"] = $totalShippingPrice;
|
| 758 |
+
// $orderInfo['orderId'] = $order_no;
|
| 759 |
+
// $orderInfo['promocode'] = $order->getCouponCode();
|
| 760 |
+
// $orderInfo['totalDiscount'] = abs($order->getDiscountAmount());
|
| 761 |
+
// $orderInfo['DiscountPer'] = abs($order->getDiscountPercent());
|
| 762 |
+
// $orderInfo['DiscountDesc'] = $order->getDiscountDescription();
|
| 763 |
+
// $orderInfo['currency'] = $order->getOrderCurrencyCode();
|
| 764 |
+
// $orderInfo['financialStatus'] = $order->getStatusLabel();
|
| 765 |
+
// $orderInfo['abandonedCheckoutUrl'] = Mage::getUrl('checkout/cart');
|
| 766 |
+
// $orderInfo['totalTaxes'] = $order->getShippingTaxAmount();
|
| 767 |
+
// $orderInfo['paymentType']=$order->getPayment()->getMethodInstance()->getCode();
|
| 768 |
+
//
|
| 769 |
+
//
|
| 770 |
+
// $cemail=$person['email'];
|
| 771 |
+
//
|
| 772 |
+
// $actionDescription = array(
|
| 773 |
+
// 'action' => 'purchased',
|
| 774 |
+
// 'email' =>$cemail,
|
| 775 |
+
// 'or' => $orderInfo,
|
| 776 |
+
// 'pd' => $actionData
|
| 777 |
+
// );
|
| 778 |
+
//
|
| 779 |
+
// $res = $this->amplify->customer_action($actionDescription);
|
| 780 |
+
//
|
| 781 |
+
// }
|
| 782 |
+
//
|
| 783 |
+
// }
|
| 784 |
+
//
|
| 785 |
+
// } catch (Exception $ex) {
|
| 786 |
+
// $this->event('error_two');
|
| 787 |
+
// }
|
| 788 |
+
}
|
| 789 |
+
|
| 790 |
public function getAmplify_checkout_allow_guest($evnt) {
|
| 791 |
try {
|
| 792 |
if ($this->verified) {
|
| 793 |
+
|
| 794 |
$getquote = $evnt->getQuote();
|
| 795 |
$data = array_filter($getquote->getData());
|
| 796 |
Mage::getModel('core/cookie')->set('amplify_email', $data['customer_email']);
|
| 806 |
}
|
| 807 |
}
|
| 808 |
|
| 809 |
+
public function getAmplifyCatalog_product_save_after($evnt) {
|
| 810 |
+
|
| 811 |
+
}
|
| 812 |
|
| 813 |
public function getAmplifyCatalog_product_delete_after_done($evnt) {
|
| 814 |
+
|
| 815 |
+
}
|
| 816 |
|
| 817 |
public function getAmplifyCatalogProductView(Varien_Event_Observer $evnt) {
|
| 818 |
try {
|
| 820 |
|
| 821 |
$product = $evnt->getEvent()->getProduct();
|
| 822 |
$catCollection = $product->getCategoryCollection();
|
| 823 |
+
|
| 824 |
$categs = $catCollection->exportToArray();
|
| 825 |
$cateHolder = array();
|
| 826 |
foreach ($categs as $cat) {
|
| 827 |
$cateName = Mage::getModel('catalog/category')->load($cat['entity_id']);
|
| 828 |
+
$name = $cateName->getName();
|
| 829 |
+
$id = $cateName->getEntityId();
|
| 830 |
+
$pid = $cateName->getParent_id();
|
| 831 |
+
if ($pid == 1) {
|
| 832 |
+
$pid = 0;
|
| 833 |
}
|
| 834 |
+
$cateHolder[$id] = array("n" => $name, "p" => $pid);
|
| 835 |
}
|
| 836 |
+
|
| 837 |
+
|
| 838 |
$event = $evnt->getEvent();
|
| 839 |
$action = $event->getControllerAction();
|
| 840 |
$stock_data = $product->getIs_in_stock();
|
| 860 |
"email" => $this->getCustomerIdentity(),
|
| 861 |
'pd' => $actionData
|
| 862 |
);
|
| 863 |
+
|
| 864 |
$res = $this->amplify->customer_action($actionDescription);
|
|
|
|
| 865 |
}
|
| 866 |
} catch (Exception $ex) {
|
| 867 |
|
| 868 |
}
|
| 869 |
}
|
| 870 |
|
| 871 |
+
public function wishlistShare(Mage_Framework_Event_Observer $evnt) {
|
| 872 |
+
|
| 873 |
+
}
|
| 874 |
|
|
|
|
| 875 |
public function getAmplifySendfriendProduct(Varien_Event_Observer $evnt) {
|
| 876 |
+
|
| 877 |
}
|
| 878 |
|
| 879 |
public function catalogProductCompareAddProduct(Varien_Event_Observer $evnt) {
|
| 880 |
+
|
| 881 |
}
|
| 882 |
+
|
| 883 |
public function getAmplifyCustomerAdressSaveAfter($evnt) {
|
| 884 |
+
|
| 885 |
}
|
| 886 |
|
| 887 |
public function getAmplifySales_order_save_commit_after($observer) {
|
| 888 |
+
|
| 889 |
}
|
| 890 |
|
| 891 |
/**
|
| 896 |
public function getAmplify_cartUpdate(Varien_Event_Observer $observer) {
|
| 897 |
try {
|
| 898 |
if ($this->verified) {
|
| 899 |
+
$i = 0;
|
| 900 |
+
$subdiff = 0;
|
| 901 |
+
$actionData = array();
|
| 902 |
+
foreach ($observer->getCart()->getQuote()->getAllVisibleItems() as $product) {
|
| 903 |
+
|
| 904 |
+
if ($product->hasDataChanges()) {
|
| 905 |
+
// print_r($product);
|
| 906 |
+
$productId = $product->getProductId();
|
| 907 |
+
$catCollection = $product->getCategoryCollection();
|
| 908 |
+
|
| 909 |
+
$categs = array(); //$catCollection->exportToArray();
|
| 910 |
+
$cateHolder = array();
|
| 911 |
+
|
| 912 |
+
$productName = $product->getName();
|
| 913 |
+
$sku = $productName . "_" . $product->getSku();
|
| 914 |
+
$qty = $product->getPrice();
|
| 915 |
+
$stock_data = $product->getIs_in_stock();
|
| 916 |
+
|
| 917 |
+
$actionData[$i]['productId'] = $product->getProductId();
|
| 918 |
+
$actionData[$i]['productTitle'] = $product->getName();
|
| 919 |
+
$actionData[$i]['sku'] = $product->getSku();
|
| 920 |
+
$actionData[$i]['price'] = $product->getPrice();
|
| 921 |
+
$actionData[$i]['currency'] = Mage::app()->getStore()->getBaseCurrencyCode();
|
| 922 |
+
$actionData[$i]['specialPrice'] = $product->getPrice();
|
| 923 |
+
$actionData[$i]['status'] = $product->getStatus();
|
| 924 |
+
$actionData[$i]['productPictureUrl'] = $product->getImageUrl();
|
| 925 |
+
$actionData[$i]['pageUrl'] = $product->getProductUrl();
|
| 926 |
+
$actionData[$i]['weight'] = $product->getWeight();
|
| 927 |
+
$oldQty = (int) $product->getOrigData('qty');
|
| 928 |
+
$newQty = (int) $product->getQty();
|
| 929 |
+
$qtyDiff = 0;
|
| 930 |
+
$subdiff = $subdiff + ($newQty - $oldQty) * $product->getPrice();
|
| 931 |
+
|
| 932 |
+
$actionData[$i]['qty'] = (int) $product->getQty();
|
| 933 |
+
$actionData[$i]['category'] = $cateHolder;
|
| 934 |
+
$i++;
|
| 935 |
+
}
|
| 936 |
}
|
|
|
|
| 937 |
$cart = Mage::getSingleton('checkout/cart');
|
| 938 |
$subTotalPrice = $cart->getQuote()->getGrandTotal();
|
| 939 |
+
$orderInfo["subtotalPrice"] = $subTotalPrice + $subdiff;
|
| 940 |
$orderInfo['abandonedCheckoutUrl'] = Mage::getUrl('checkout/cart');
|
| 941 |
+
$orderInfo['currency'] = Mage::app()->getStore()->getBaseCurrencyCode();
|
| 942 |
$actionDescription = array(
|
| 943 |
'or' => $orderInfo,
|
| 944 |
'email' => $this->getCustomerIdentity(),
|
| 945 |
'action' => 'update_cart',
|
| 946 |
'pd' => $actionData
|
| 947 |
);
|
| 948 |
+
|
| 949 |
+
$res = $this->amplify->customer_action($actionDescription);
|
|
|
|
| 950 |
}
|
| 951 |
} catch (Exception $ex) {
|
| 952 |
|
| 954 |
}
|
| 955 |
|
| 956 |
public function getAmplifyCancelOrderItem($observer) {
|
| 957 |
+
|
| 958 |
}
|
| 959 |
|
| 960 |
public function sendData() {
|
| 961 |
+
|
| 962 |
}
|
| 963 |
|
| 964 |
+
}
|
app/code/community/Betaout/Amplify/Model/Order.php
DELETED
|
@@ -1,12 +0,0 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
class Betaout_Amplify_Model_Order extends Mage_Sales_Model_Order
|
| 4 |
-
{
|
| 5 |
-
|
| 6 |
-
public function setState($state, $status = false, $comment = '', $isCustomerNotified = null)
|
| 7 |
-
{
|
| 8 |
-
Mage::dispatchEvent('sales_order_status_change', array('order' => $this, 'state' => $state, 'status' => $status, 'comment' => $comment, 'isCustomerNotified' => $isCustomerNotified));
|
| 9 |
-
|
| 10 |
-
return parent::setState($state, $status, $comment, $isCustomerNotified);
|
| 11 |
-
}
|
| 12 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Betaout/Amplify/etc/config.xml
CHANGED
|
@@ -14,11 +14,6 @@
|
|
| 14 |
<betaout_amplify_mysql4>
|
| 15 |
<class>Betaout_Amplify_Model_Mysql4</class>
|
| 16 |
</betaout_amplify_mysql4>
|
| 17 |
-
<sales>
|
| 18 |
-
<rewrite>
|
| 19 |
-
<order>Betaout_Amplify_Model_Order</order>
|
| 20 |
-
</rewrite>
|
| 21 |
-
</sales>
|
| 22 |
</models>
|
| 23 |
|
| 24 |
<helpers>
|
|
@@ -53,16 +48,7 @@
|
|
| 53 |
</betaout_amplify_checkout_cart_update_items_after>
|
| 54 |
</observers>
|
| 55 |
</checkout_cart_update_items_after>
|
| 56 |
-
|
| 57 |
-
<observers>
|
| 58 |
-
<sales_order_status_change>
|
| 59 |
-
<type>singleton</type>
|
| 60 |
-
<class>Betaout_Amplify_Model_Key</class>
|
| 61 |
-
<method>getAmplifyCheckOrderStatus</method>
|
| 62 |
-
</sales_order_status_change>
|
| 63 |
-
</observers>
|
| 64 |
-
</sales_order_status_change>
|
| 65 |
-
<customer_address_save_before>
|
| 66 |
<observers>
|
| 67 |
<customer_address_before_save>
|
| 68 |
<class>Betaout_Amplify_Model_Key</class>
|
|
@@ -115,6 +101,15 @@
|
|
| 115 |
</observers>
|
| 116 |
</sales_order_save_commit_after>
|
| 117 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 118 |
</events>
|
| 119 |
|
| 120 |
</global>
|
| 14 |
<betaout_amplify_mysql4>
|
| 15 |
<class>Betaout_Amplify_Model_Mysql4</class>
|
| 16 |
</betaout_amplify_mysql4>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 17 |
</models>
|
| 18 |
|
| 19 |
<helpers>
|
| 48 |
</betaout_amplify_checkout_cart_update_items_after>
|
| 49 |
</observers>
|
| 50 |
</checkout_cart_update_items_after>
|
| 51 |
+
<customer_address_save_before>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 52 |
<observers>
|
| 53 |
<customer_address_before_save>
|
| 54 |
<class>Betaout_Amplify_Model_Key</class>
|
| 101 |
</observers>
|
| 102 |
</sales_order_save_commit_after>
|
| 103 |
|
| 104 |
+
<checkout_type_onepage_save_order_after>
|
| 105 |
+
<observers>
|
| 106 |
+
<amplify_save_order_observer>
|
| 107 |
+
<class>Betaout_Amplify_Model_Key</class>
|
| 108 |
+
<method>getAmplifyOrderSaveSuccess</method>
|
| 109 |
+
</amplify_save_order_observer>
|
| 110 |
+
</observers>
|
| 111 |
+
</checkout_type_onepage_save_order_after>
|
| 112 |
+
|
| 113 |
</events>
|
| 114 |
|
| 115 |
</global>
|
app/design/frontend/base/default/template/betaout_amplify/checkout.phtml
CHANGED
|
@@ -38,5 +38,5 @@
|
|
| 38 |
|
| 39 |
});
|
| 40 |
}
|
| 41 |
-
|
| 42 |
</script>
|
| 38 |
|
| 39 |
});
|
| 40 |
}
|
| 41 |
+
|
| 42 |
</script>
|
app/design/frontend/base/default/template/betaout_amplify/head.phtml
CHANGED
|
@@ -16,7 +16,7 @@ try {
|
|
| 16 |
?>
|
| 17 |
<script type="text/javascript">
|
| 18 |
var Amplify = "";
|
| 19 |
-
_bOutCW
|
| 20 |
_bOutST = "<?php echo Mage::getStoreConfig("betaout_amplify_options/settings/shareTracking"); ?>";
|
| 21 |
urlTracking = "<?php echo Mage::getStoreConfig("betaout_amplify_options/settings/urlTracking"); ?>";
|
| 22 |
_bOutAKEY = '<?php echo Mage::getStoreConfig("betaout_amplify_options/settings/amplify_key"); ?>';
|
| 16 |
?>
|
| 17 |
<script type="text/javascript">
|
| 18 |
var Amplify = "";
|
| 19 |
+
_bOutCW =<?php echo Mage::getStoreConfig("betaout_amplify_options/settings/AmplifyConnect_Widget"); ?>;
|
| 20 |
_bOutST = "<?php echo Mage::getStoreConfig("betaout_amplify_options/settings/shareTracking"); ?>";
|
| 21 |
urlTracking = "<?php echo Mage::getStoreConfig("betaout_amplify_options/settings/urlTracking"); ?>";
|
| 22 |
_bOutAKEY = '<?php echo Mage::getStoreConfig("betaout_amplify_options/settings/amplify_key"); ?>';
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Betaout</name>
|
| 4 |
-
<version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>GPL</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>Helping Ecommerce Companies drive more sales and customer happiness. </summary>
|
| 10 |
<description>Helping Ecommerce Companies drive more sales and customer happiness. </description>
|
| 11 |
-
<notes>Fix some issues
|
| 12 |
<authors><author><name>jitendra</name><user>jitendra</user><email>jitendra@getamplify.com</email></author></authors>
|
| 13 |
-
<date>2015-
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="magecommunity"><dir name="Betaout"><dir name="Amplify"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><file name="About.php" hash="5d714a88c93aa83a3cdfed81712a1611"/><dir name="Form"><dir name="Field"><file name="Conflict.php" hash="6f91b2528452ee1a96440d3a9da43962"/></dir></dir><file name="Logo.php" hash="40f74b3fab0f1bed08315ae83abb4d42"/></dir></dir><dir name="Widget"><dir name="Button"><file name="Conflict.php" hash="903c3c00124ae86bde48f7ce2ad2f066"/></dir></dir></dir><file name="Conflictprinter.php" hash="ce0256621be50bfe02bf01a80ac11b20"/></dir><dir name="Helper"><file name="Conflictchecker.php" hash="a03e8cff4427d5a7ed28f06530f75838"/><file name="Data.php" hash="ab8d5234d07dd762f516169f3be73fe8"/></dir><dir name="Model"><file name="Amplify.php" hash="c7ed7162f4f2fc17d5e7da650a3df95c"/><file name="Amplifyconnectwidget.php" hash="904cedccd8685cb3f4e801b81802ec6d"/><dir name="Config"><file name="Blocks.php" hash="d32094f94f70ddc75f4ecb4ea90bdc16"/><file name="Checker.php" hash="b2b4fc113e7511f23360dc01ca3dc7e3"/><file name="ConfigAbstract.php" hash="b19f0f25177fbea91c817758886d6373"/><file name="ConfigInterface.php" hash="85c1b11953b73728feb498ae81711c29"/><file name="Datastore.php" hash="f8a8c60c2f4e1801941c334ebe45cc1a"/><file name="Helpers.php" hash="f337bdceb3fb867f7e2aa8ad90b1216e"/><file name="Models.php" hash="500a145c160beb6797f7450d03069637"/><file name="Printer.php" hash="577801efaeb6bc6dd8bd096875fda08b"/><file name="Resources.php" hash="1f14e467d10ba2afbd2354f78c0047e7"/></dir><dir name="Core"><dir name="Config"><file name="Base.php" hash="7bccfac5cac9b19f1073bb97568958f8"/><file name="Element.php" hash="d2ce6a9a5840dbe335514b7455c60688"/></dir><file name="Config.php" hash="4222a35a2c71b3702199efbfddbee701"/></dir><file name="CronStatus.php" hash="298e6e428249ed7020c27e3c8abc52a2"/><file name="Key.php" hash="
|
| 16 |
<compatible/>
|
| 17 |
-
<dependencies><required><php><min>5.0.0</min><max>5.6.
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Betaout</name>
|
| 4 |
+
<version>2.0.0</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>GPL</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>Helping Ecommerce Companies drive more sales and customer happiness. </summary>
|
| 10 |
<description>Helping Ecommerce Companies drive more sales and customer happiness. </description>
|
| 11 |
+
<notes>Fix some issues tracking order after payment of thirdparty like paypal,PU etc</notes>
|
| 12 |
<authors><author><name>jitendra</name><user>jitendra</user><email>jitendra@getamplify.com</email></author></authors>
|
| 13 |
+
<date>2015-09-17</date>
|
| 14 |
+
<time>10:33:07</time>
|
| 15 |
+
<contents><target name="magecommunity"><dir name="Betaout"><dir name="Amplify"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><file name="About.php" hash="5d714a88c93aa83a3cdfed81712a1611"/><dir name="Form"><dir name="Field"><file name="Conflict.php" hash="6f91b2528452ee1a96440d3a9da43962"/></dir></dir><file name="Logo.php" hash="40f74b3fab0f1bed08315ae83abb4d42"/></dir></dir><dir name="Widget"><dir name="Button"><file name="Conflict.php" hash="903c3c00124ae86bde48f7ce2ad2f066"/></dir></dir></dir><file name="Conflictprinter.php" hash="ce0256621be50bfe02bf01a80ac11b20"/></dir><dir name="Helper"><file name="Conflictchecker.php" hash="a03e8cff4427d5a7ed28f06530f75838"/><file name="Data.php" hash="ab8d5234d07dd762f516169f3be73fe8"/></dir><dir name="Model"><file name="Amplify.php" hash="c7ed7162f4f2fc17d5e7da650a3df95c"/><file name="Amplifyconnectwidget.php" hash="904cedccd8685cb3f4e801b81802ec6d"/><dir name="Config"><file name="Blocks.php" hash="d32094f94f70ddc75f4ecb4ea90bdc16"/><file name="Checker.php" hash="b2b4fc113e7511f23360dc01ca3dc7e3"/><file name="ConfigAbstract.php" hash="b19f0f25177fbea91c817758886d6373"/><file name="ConfigInterface.php" hash="85c1b11953b73728feb498ae81711c29"/><file name="Datastore.php" hash="f8a8c60c2f4e1801941c334ebe45cc1a"/><file name="Helpers.php" hash="f337bdceb3fb867f7e2aa8ad90b1216e"/><file name="Models.php" hash="500a145c160beb6797f7450d03069637"/><file name="Printer.php" hash="577801efaeb6bc6dd8bd096875fda08b"/><file name="Resources.php" hash="1f14e467d10ba2afbd2354f78c0047e7"/></dir><dir name="Core"><dir name="Config"><file name="Base.php" hash="7bccfac5cac9b19f1073bb97568958f8"/><file name="Element.php" hash="d2ce6a9a5840dbe335514b7455c60688"/></dir><file name="Config.php" hash="4222a35a2c71b3702199efbfddbee701"/></dir><file name="CronStatus.php" hash="298e6e428249ed7020c27e3c8abc52a2"/><file name="Key.php" hash="905c8ac80439e55f9a09be2444283e7d"/><dir name="Lib"><dir name="Varien"><dir name="Simplexml"><file name="Config.php" hash="eba1dfcc303065cf5b3c9067d87dd35a"/><file name="Element.php" hash="24cb3b7db31ae8e2c813485a6b6ef749"/></dir></dir></dir><dir name="Mysql4"><dir name="Core"><file name="Config.php" hash="c0a59f8ff1f747224655de39b217abde"/></dir></dir><dir name="Path"><dir name="Locator"><file name="Array.php" hash="722f4125eb1cbd5fbc2be05facd44cd4"/><file name="Factory.php" hash="5a57006974d9870affbcbafa6ed00175"/><file name="IteratorAbstract.php" hash="adba5c801c91efdbc5afa493d353224a"/><file name="LocatorInterface.php" hash="30571ef5c7ebf942870a0ddd2ab341cb"/><file name="Stack.php" hash="73a27e38db4768019613c99407205771"/></dir></dir><dir name="Resource"><dir name="Core"><file name="Config.php" hash="14736455e9f006a69dc638e4b93f7e6e"/></dir><dir name="Db"><file name="Abstract.php" hash="3874d4c5cc4b1af30a550cc792bbe22f"/></dir></dir><file name="Sharetracking.php" hash="05f4fe212dfd53027525bae6321ea641"/><file name="Urltracking.php" hash="d4e7e48cbb8168c2baab17e1edde1eac"/><file name="Verify.php" hash="3e385480fdfdfb3b1219ba48c1ef1644"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="ConflictcheckerController.php" hash="28bf9f8cca4f3e63ea90c575c424deb0"/></dir><file name="indexController.php" hash="ca84b19b9ee9ea2678ba6ef5a6d23afa"/></dir><dir name="etc"><file name="config.xml" hash="85abe907f3aa4bf3a8f70dce84fc5679"/><file name="system.xml" hash="2f980139f06c219fc2c1d1169a89883f"/></dir><dir name="log"><file name="log.log" hash="be8a8d092fd7ba1381cfbe23eda18c2e"/></dir><file name=".DS_Store" hash="e49cca224ac24efb7898b1adf5d52aaf"/></dir><file name=".DS_Store" hash="a27a5b993e15852172640eb72dabed84"/></dir></target><target name="mageetc"><dir name="modules"><file name="Betaout_Amplify.xml" hash="a8228fbbf2d0a09dc90cd7c80b4692f0"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="betaout_amplify.xml" hash="328dab6359ba6464621e558238610035"/></dir><dir name="template"><dir name="betaout_amplify"><file name="amplify.phtml" hash="ce94f7e9e16d3c519bc8efcf4541716c"/><file name="conflict.phtml" hash="43277d57972e4f750d8b65e0bfb5bcb8"/><file name="logo.phtml" hash="0af4376bf5074d24519ab7e9d3ea035b"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="betaout_amplify"><file name="checkout.phtml" hash="1d7652b352f2d7a3edb1f3bb48bc858e"/><file name="head.phtml" hash="f1e2aec315b8049593a4a299231d2713"/></dir></dir><dir name="layout"><file name="betaout_amplify.xml" hash="f262133af716b7e0c33ebc044e06518c"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="base"><dir name="default"><dir name="amplify"><dir name="images"><file name="Users.png" hash="96e906660b1fbd8a17831bd3049dbcfa"/><file name="ajax-loader-tr.gif" hash="1ae32bc8232ff2527c627e5b38eb319a"/><file name="ajax-loader.gif" hash="e2a38f1e23288e315af3c55416bc1ce7"/><file name="btn.png" hash="769b6736cb1bb8cb91ad7526ce9d9db8"/><file name="check.png" hash="252fd93a83e2a412ecd3b6eac01500b7"/><file name="com-app.png" hash="1f241f552bdbe1f86763981c79c8d85f"/><file name="db-1.png" hash="840d96bd5679bf4fa2d6a9577f7d3539"/><file name="engage-app.png" hash="888cde6a10a3dd9abcfccd1a5f0c8fde"/><file name="icon.png" hash="22ea725b0bee73cb03f63b063b02469f"/><file name="large_bracket.png" hash="d2e8da8266e513bd5f15b0c9855be058"/><file name="mini_bracket.png" hash="e844112e5e5173f64b3385a4a140bdeb"/></dir></dir></dir></dir></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
+
<dependencies><required><php><min>5.0.0</min><max>5.6.13</max></php></required></dependencies>
|
| 18 |
</package>
|
