Version Notes
New features :
- Improved Category 1 logic
Download this release
Release Info
Developer | BeezUP |
Extension | BeezUP_Module_feed_and_tracker |
Version | 4.7.6 |
Comparing to | |
See all releases |
Code changes from version 4.7.5 to 4.7.6
- app/code/community/BeezUp/Block/Order.php +7 -1
- app/code/community/BeezUp/Block/Xml.php +48 -23
- app/code/community/BeezUp/Model/Products.php +116 -85
- app/code/community/BeezUp/etc/config.xml +1 -1
- app/code/community/BeezUp/etc/system.xml +3 -3
- app/design/adminhtml/default/default/template/beezup/custom.phtml +87 -84
- package.xml +5 -5
app/code/community/BeezUp/Block/Order.php
CHANGED
@@ -353,7 +353,8 @@ class Beezup_Block_Order extends Mage_core_block_text {
|
|
353 |
"order_region" => $order_region,
|
354 |
"marketplace" => $marketplace,
|
355 |
"discounts" => $mage_productIds['discounts'],
|
356 |
-
"marketplace_business_code" => $marketplace_business_code
|
|
|
357 |
);
|
358 |
|
359 |
|
@@ -1069,6 +1070,11 @@ class Beezup_Block_Order extends Mage_core_block_text {
|
|
1069 |
if(empty($tot_comm ) || $tot_comm == 0) {
|
1070 |
$beezup_comission = 0;
|
1071 |
}
|
|
|
|
|
|
|
|
|
|
|
1072 |
$query = "UPDATE {$table} SET beezup_marketplace = '{$marketplace}', beezup_name = '{$beezup_account_id}', beezup_order = 1, beezup_market_order_id = '{$market_order_id}',
|
1073 |
beezup_order_id = '{$beezup_order_id}', beezup_status = '{$beezup_status}', beezup_last_modification_date = '{$beezup_last_modification_date}',
|
1074 |
beezup_marketplace_status = '{$beezup_marketplace_status}', beezup_purchase_date = '{$beezup_purchase_date}', beezup_marketplace_last_modification_date = '{$beezup_marketplace_last_modification_date}',
|
353 |
"order_region" => $order_region,
|
354 |
"marketplace" => $marketplace,
|
355 |
"discounts" => $mage_productIds['discounts'],
|
356 |
+
"marketplace_business_code" => $marketplace_business_code,
|
357 |
+
"marketChannel" => $marketChannel
|
358 |
);
|
359 |
|
360 |
|
1070 |
if(empty($tot_comm ) || $tot_comm == 0) {
|
1071 |
$beezup_comission = 0;
|
1072 |
}
|
1073 |
+
|
1074 |
+
if($data['marketChannel'] == "AFN") {
|
1075 |
+
$marketplace = $marketplace." - FBA";
|
1076 |
+
}
|
1077 |
+
|
1078 |
$query = "UPDATE {$table} SET beezup_marketplace = '{$marketplace}', beezup_name = '{$beezup_account_id}', beezup_order = 1, beezup_market_order_id = '{$market_order_id}',
|
1079 |
beezup_order_id = '{$beezup_order_id}', beezup_status = '{$beezup_status}', beezup_last_modification_date = '{$beezup_last_modification_date}',
|
1080 |
beezup_marketplace_status = '{$beezup_marketplace_status}', beezup_purchase_date = '{$beezup_purchase_date}', beezup_marketplace_last_modification_date = '{$beezup_marketplace_last_modification_date}',
|
app/code/community/BeezUp/Block/Xml.php
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
class BeezUp_Block_Xml extends Mage_Core_Block_Text
|
5 |
{
|
6 |
/**
|
7 |
-
Xml permet de r�cup�rer tous les produits simples
|
8 |
**/
|
9 |
public function getXml($paginate = false)
|
10 |
{
|
@@ -31,7 +31,15 @@
|
|
31 |
$_tablerates =0;
|
32 |
$cat_logic = false;
|
33 |
if($category_logic == 1) {
|
34 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
35 |
} else {
|
36 |
$cat_logic = true;
|
37 |
$categories = Mage::getModel('catalog/category')->getCollection()
|
@@ -69,7 +77,7 @@
|
|
69 |
$shipping = $beezup->getDelivery($qty);
|
70 |
$price = $p->getPrice();
|
71 |
$final_price = $p->getFinalPrice();
|
72 |
-
if (($image = $p->getImage()) == "no_selection" || ($image = $p->getImage()) == "") // Si on ne trouve pas d'image avec getImage on r�cup�re la smallImage
|
73 |
$image = $p->getSmallImage();
|
74 |
|
75 |
|
@@ -166,7 +174,7 @@
|
|
166 |
}
|
167 |
|
168 |
/**
|
169 |
-
Configurable permet de r�cup�rer tous les produits (p�re, enfant et simple)
|
170 |
**/
|
171 |
public function getXmlConfigurable($paginate = false)
|
172 |
{
|
@@ -190,7 +198,13 @@
|
|
190 |
$_tablerates = 0;
|
191 |
$cat_logic = false;
|
192 |
if($category_logic == 1) {
|
193 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
194 |
} else {
|
195 |
$cat_logic = true;
|
196 |
$categories = Mage::getModel('catalog/category')->getCollection()
|
@@ -208,7 +222,7 @@
|
|
208 |
$xml = "\xEF\xBB\xBF";
|
209 |
$xml .= '<?xml version="1.0" encoding="utf-8"?>' . PHP_EOL . '<catalog>' . PHP_EOL;
|
210 |
|
211 |
-
//r�cup�re tous les produits
|
212 |
$products = $beezup->getProducts(false, $paginate);
|
213 |
$childs = $beezup->getConfigurableProducts(true);
|
214 |
$backendModel = $products->getResource()->getAttribute('media_gallery')->getBackend();
|
@@ -237,7 +251,7 @@
|
|
237 |
//we get product object from catalog/product reason(beezup/products gets products from catalog/product_collection, didn't find the way to get image collection from there *will check)
|
238 |
|
239 |
if (count($categories)) {
|
240 |
-
//si l'�l�ment est un p�re, on va traiter ces enfants
|
241 |
if(isset($childs[$p->getId()])) {
|
242 |
$childrens = $childs[$p->getId()];
|
243 |
|
@@ -354,11 +368,11 @@
|
|
354 |
$shipping = $beezup->getDelivery($qty);
|
355 |
$price = $p->getPrice();
|
356 |
$final_price = $p->getFinalPrice();
|
357 |
-
if (($image = $p->getImage()) == "no_selection" || ($image = $p->getImage()) == "") // Si on ne trouve pas d'image avec getImage on r�cup�re la smallImage
|
358 |
$image = $p->getSmallImage();
|
359 |
|
360 |
|
361 |
-
// si c'est un �l�ment parent
|
362 |
$xml .= '<product>';
|
363 |
$xml .= $helper->tag($this->__('b_unique_id'), $p->getId());
|
364 |
$xml .= $helper->tag($this->__('b_sku'), trim($p->getSku()), 1);
|
@@ -442,7 +456,7 @@
|
|
442 |
$shipping = $beezup->getDelivery($qty);
|
443 |
$price = $p->getPrice();
|
444 |
$final_price = $p->getFinalPrice();
|
445 |
-
if (($image = $p->getImage()) == "no_selection" || ($image = $p->getImage()) == "") // Si on ne trouve pas d'image avec getImage on r�cup�re la smallImage
|
446 |
$image = $p->getSmallImage();
|
447 |
|
448 |
|
@@ -524,7 +538,7 @@
|
|
524 |
|
525 |
|
526 |
/**
|
527 |
-
Children permet de r�cup�rer tous les produits enfants
|
528 |
**/
|
529 |
public function getXmlChild($paginate = false)
|
530 |
{
|
@@ -547,7 +561,13 @@
|
|
547 |
$_tablerates = 0;
|
548 |
$cat_logic = false;
|
549 |
if($category_logic == 1) {
|
550 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
551 |
} else {
|
552 |
$cat_logic = true;
|
553 |
$categories = Mage::getModel('catalog/category')->getCollection()
|
@@ -569,7 +589,7 @@
|
|
569 |
|
570 |
foreach ($childs as $c) {
|
571 |
|
572 |
-
//r�cup�rer l'image sur le p�re
|
573 |
$productParentIds=Mage::getResourceSingleton('catalog/product_type_configurable')->getParentIdsByChild($c->getId());
|
574 |
foreach($productParentIds as $productParentId){
|
575 |
$productParent = Mage::getModel('catalog/product')->load($productParentId);
|
@@ -609,7 +629,7 @@
|
|
609 |
$xml .= $helper->tag($this->__('b_product_url'), $url, 1);
|
610 |
|
611 |
|
612 |
-
$xml .= $helper->tag($this->__('url_image'), $helper->getImageDir() . $image, 1); //r�cup�re l'image sur le p�re
|
613 |
|
614 |
if($many_images == 1) {
|
615 |
$product = Mage::getModel('catalog/product')->load( $c->getId());
|
@@ -684,8 +704,13 @@
|
|
684 |
$_tablerates = 0;
|
685 |
$cat_logic = false;
|
686 |
|
687 |
-
|
688 |
-
|
|
|
|
|
|
|
|
|
|
|
689 |
|
690 |
$_vat = ($_ht && is_numeric($helper->getConfig('beezup/flux/vat'))) ? (preg_replace('(\,+)', '.', $helper->getConfig('beezup/flux/vat')) / 100) + 1 : 1;
|
691 |
$_attributes = $helper->getConfig('beezup/flux/attributes') ? explode(',', $helper->getConfig('beezup/flux/attributes')) : array();
|
@@ -714,7 +739,7 @@
|
|
714 |
$image = $this->fillImageUrl($product, $g);
|
715 |
|
716 |
|
717 |
-
//if (($image = $g->getImage()) == "no_selection" || ($image = $g->getImage()) == "") // Si on ne trouve pas d'image avec getImage on r�cup�re la smallImage
|
718 |
// $image = $g->getSmallImage();
|
719 |
|
720 |
|
@@ -740,7 +765,7 @@
|
|
740 |
|
741 |
$i = 1;
|
742 |
foreach ($parentCategories as $v)
|
743 |
-
echo "Cat�gorie ".$i." : ".$v."<br/>";
|
744 |
}
|
745 |
|
746 |
|
@@ -764,7 +789,7 @@
|
|
764 |
|
765 |
|
766 |
$buf .= $helper->tag($this->__('b_product_url'), $parentUrl, 1);
|
767 |
-
$buf .= $helper->tag($this->__('b_product_image'), $helper->getImageDir() . $image, 1); //r�cup�re l'image sur le p�re
|
768 |
|
769 |
|
770 |
|
@@ -800,7 +825,7 @@
|
|
800 |
protected function fillImageUrl($p, $c)
|
801 |
{
|
802 |
$image = $c->getImage();
|
803 |
-
if ($image == "no_selection" || $image == "") // Si on ne trouve pas d'image avec getImage on r�cup�re la smallImage
|
804 |
{
|
805 |
$image = $c->getSmallImage();
|
806 |
if ($image == "no_selection" || $image == "")
|
@@ -845,9 +870,9 @@
|
|
845 |
protected function createFolder()
|
846 |
{
|
847 |
$helper = Mage::helper('beezup');
|
848 |
-
if (!$helper->getConfig('beezup/flux/cachedelay')) // Si option cache desactiv�e, pas besoin du dossier
|
849 |
return (true);
|
850 |
-
if (file_exists('beezup/tmp')) // Si le dossier existe deja, pas besoin de le recr�er
|
851 |
return (true);
|
852 |
if (!mkdir('beezup/tmp', 0777, true))
|
853 |
{
|
@@ -879,7 +904,7 @@
|
|
879 |
$this->getAssociatedProducto(true);
|
880 |
return;*/
|
881 |
$paginate = $this->getPagination();
|
882 |
-
if (!$this->createFolder()) // Si on rencontre des probl�mes de cr�ation de dossier on retourne rien
|
883 |
return;
|
884 |
if ($this->getConfigurable()){ // Appel de l'url http://site.com/beezup/catalog/configurable
|
885 |
if ($this->needRefreshing('configurable_'.$storeId.'_'.$websiteId)){
|
4 |
class BeezUp_Block_Xml extends Mage_Core_Block_Text
|
5 |
{
|
6 |
/**
|
7 |
+
Xml permet de r�cup�rer tous les produits simples
|
8 |
**/
|
9 |
public function getXml($paginate = false)
|
10 |
{
|
31 |
$_tablerates =0;
|
32 |
$cat_logic = false;
|
33 |
if($category_logic == 1) {
|
34 |
+
//$_categories = $beezup->getCategoriesAsArray(Mage::helper('catalog/category')->getStoreCategories());
|
35 |
+
$categories = Mage::getModel('catalog/category')->getCollection()
|
36 |
+
->addAttributeToSelect('*')
|
37 |
+
->addAttributeToSort('path', 'asc')
|
38 |
+
->load()
|
39 |
+
->toArray();
|
40 |
+
|
41 |
+
$_categories = $beezup->getCategoryLogic1Tree($categories);
|
42 |
+
|
43 |
} else {
|
44 |
$cat_logic = true;
|
45 |
$categories = Mage::getModel('catalog/category')->getCollection()
|
77 |
$shipping = $beezup->getDelivery($qty);
|
78 |
$price = $p->getPrice();
|
79 |
$final_price = $p->getFinalPrice();
|
80 |
+
if (($image = $p->getImage()) == "no_selection" || ($image = $p->getImage()) == "") // Si on ne trouve pas d'image avec getImage on r�cup�re la smallImage
|
81 |
$image = $p->getSmallImage();
|
82 |
|
83 |
|
174 |
}
|
175 |
|
176 |
/**
|
177 |
+
Configurable permet de r�cup�rer tous les produits (p�re, enfant et simple)
|
178 |
**/
|
179 |
public function getXmlConfigurable($paginate = false)
|
180 |
{
|
198 |
$_tablerates = 0;
|
199 |
$cat_logic = false;
|
200 |
if($category_logic == 1) {
|
201 |
+
//$_categories = $beezup->getCategoriesAsArray(Mage::helper('catalog/category')->getStoreCategories());
|
202 |
+
$categories = Mage::getModel('catalog/category')->getCollection()
|
203 |
+
->addAttributeToSelect('*')
|
204 |
+
->addAttributeToSort('path', 'asc')
|
205 |
+
->load()
|
206 |
+
->toArray();
|
207 |
+
$_categories = $beezup->getCategoryLogic1Tree($categories);
|
208 |
} else {
|
209 |
$cat_logic = true;
|
210 |
$categories = Mage::getModel('catalog/category')->getCollection()
|
222 |
$xml = "\xEF\xBB\xBF";
|
223 |
$xml .= '<?xml version="1.0" encoding="utf-8"?>' . PHP_EOL . '<catalog>' . PHP_EOL;
|
224 |
|
225 |
+
//r�cup�re tous les produits
|
226 |
$products = $beezup->getProducts(false, $paginate);
|
227 |
$childs = $beezup->getConfigurableProducts(true);
|
228 |
$backendModel = $products->getResource()->getAttribute('media_gallery')->getBackend();
|
251 |
//we get product object from catalog/product reason(beezup/products gets products from catalog/product_collection, didn't find the way to get image collection from there *will check)
|
252 |
|
253 |
if (count($categories)) {
|
254 |
+
//si l'�l�ment est un p�re, on va traiter ces enfants
|
255 |
if(isset($childs[$p->getId()])) {
|
256 |
$childrens = $childs[$p->getId()];
|
257 |
|
368 |
$shipping = $beezup->getDelivery($qty);
|
369 |
$price = $p->getPrice();
|
370 |
$final_price = $p->getFinalPrice();
|
371 |
+
if (($image = $p->getImage()) == "no_selection" || ($image = $p->getImage()) == "") // Si on ne trouve pas d'image avec getImage on r�cup�re la smallImage
|
372 |
$image = $p->getSmallImage();
|
373 |
|
374 |
|
375 |
+
// si c'est un �l�ment parent
|
376 |
$xml .= '<product>';
|
377 |
$xml .= $helper->tag($this->__('b_unique_id'), $p->getId());
|
378 |
$xml .= $helper->tag($this->__('b_sku'), trim($p->getSku()), 1);
|
456 |
$shipping = $beezup->getDelivery($qty);
|
457 |
$price = $p->getPrice();
|
458 |
$final_price = $p->getFinalPrice();
|
459 |
+
if (($image = $p->getImage()) == "no_selection" || ($image = $p->getImage()) == "") // Si on ne trouve pas d'image avec getImage on r�cup�re la smallImage
|
460 |
$image = $p->getSmallImage();
|
461 |
|
462 |
|
538 |
|
539 |
|
540 |
/**
|
541 |
+
Children permet de r�cup�rer tous les produits enfants
|
542 |
**/
|
543 |
public function getXmlChild($paginate = false)
|
544 |
{
|
561 |
$_tablerates = 0;
|
562 |
$cat_logic = false;
|
563 |
if($category_logic == 1) {
|
564 |
+
//$_categories = $beezup->getCategoriesAsArray(Mage::helper('catalog/category')->getStoreCategories());
|
565 |
+
$categories = Mage::getModel('catalog/category')->getCollection()
|
566 |
+
->addAttributeToSelect('*')
|
567 |
+
->addAttributeToSort('path', 'asc')
|
568 |
+
->load()
|
569 |
+
->toArray();
|
570 |
+
$_categories = $beezup->getCategoryLogic1Tree($categories);
|
571 |
} else {
|
572 |
$cat_logic = true;
|
573 |
$categories = Mage::getModel('catalog/category')->getCollection()
|
589 |
|
590 |
foreach ($childs as $c) {
|
591 |
|
592 |
+
//r�cup�rer l'image sur le p�re
|
593 |
$productParentIds=Mage::getResourceSingleton('catalog/product_type_configurable')->getParentIdsByChild($c->getId());
|
594 |
foreach($productParentIds as $productParentId){
|
595 |
$productParent = Mage::getModel('catalog/product')->load($productParentId);
|
629 |
$xml .= $helper->tag($this->__('b_product_url'), $url, 1);
|
630 |
|
631 |
|
632 |
+
$xml .= $helper->tag($this->__('url_image'), $helper->getImageDir() . $image, 1); //r�cup�re l'image sur le p�re
|
633 |
|
634 |
if($many_images == 1) {
|
635 |
$product = Mage::getModel('catalog/product')->load( $c->getId());
|
704 |
$_tablerates = 0;
|
705 |
$cat_logic = false;
|
706 |
|
707 |
+
//$_categories = $beezup->getCategoriesAsArray(Mage::helper('catalog/category')->getStoreCategories());
|
708 |
+
$categories = Mage::getModel('catalog/category')->getCollection()
|
709 |
+
->addAttributeToSelect('*')
|
710 |
+
->addAttributeToSort('path', 'asc')
|
711 |
+
->load()
|
712 |
+
->toArray();
|
713 |
+
$_categories = $beezup->getCategoryLogic1Tree($categories);
|
714 |
|
715 |
$_vat = ($_ht && is_numeric($helper->getConfig('beezup/flux/vat'))) ? (preg_replace('(\,+)', '.', $helper->getConfig('beezup/flux/vat')) / 100) + 1 : 1;
|
716 |
$_attributes = $helper->getConfig('beezup/flux/attributes') ? explode(',', $helper->getConfig('beezup/flux/attributes')) : array();
|
739 |
$image = $this->fillImageUrl($product, $g);
|
740 |
|
741 |
|
742 |
+
//if (($image = $g->getImage()) == "no_selection" || ($image = $g->getImage()) == "") // Si on ne trouve pas d'image avec getImage on r�cup�re la smallImage
|
743 |
// $image = $g->getSmallImage();
|
744 |
|
745 |
|
765 |
|
766 |
$i = 1;
|
767 |
foreach ($parentCategories as $v)
|
768 |
+
echo "Cat�gorie ".$i." : ".$v."<br/>";
|
769 |
}
|
770 |
|
771 |
|
789 |
|
790 |
|
791 |
$buf .= $helper->tag($this->__('b_product_url'), $parentUrl, 1);
|
792 |
+
$buf .= $helper->tag($this->__('b_product_image'), $helper->getImageDir() . $image, 1); //r�cup�re l'image sur le p�re
|
793 |
|
794 |
|
795 |
|
825 |
protected function fillImageUrl($p, $c)
|
826 |
{
|
827 |
$image = $c->getImage();
|
828 |
+
if ($image == "no_selection" || $image == "") // Si on ne trouve pas d'image avec getImage on r�cup�re la smallImage
|
829 |
{
|
830 |
$image = $c->getSmallImage();
|
831 |
if ($image == "no_selection" || $image == "")
|
870 |
protected function createFolder()
|
871 |
{
|
872 |
$helper = Mage::helper('beezup');
|
873 |
+
if (!$helper->getConfig('beezup/flux/cachedelay')) // Si option cache desactiv�e, pas besoin du dossier
|
874 |
return (true);
|
875 |
+
if (file_exists('beezup/tmp')) // Si le dossier existe deja, pas besoin de le recr�er
|
876 |
return (true);
|
877 |
if (!mkdir('beezup/tmp', 0777, true))
|
878 |
{
|
904 |
$this->getAssociatedProducto(true);
|
905 |
return;*/
|
906 |
$paginate = $this->getPagination();
|
907 |
+
if (!$this->createFolder()) // Si on rencontre des probl�mes de cr�ation de dossier on retourne rien
|
908 |
return;
|
909 |
if ($this->getConfigurable()){ // Appel de l'url http://site.com/beezup/catalog/configurable
|
910 |
if ($this->needRefreshing('configurable_'.$storeId.'_'.$websiteId)){
|
app/code/community/BeezUp/Model/Products.php
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
<?php
|
2 |
-
|
3 |
class BeezUp_Model_Products extends Mage_Core_Model_Abstract
|
4 |
{
|
5 |
-
|
6 |
/*
|
7 |
* Retrieve products collection
|
8 |
*
|
@@ -29,7 +29,7 @@
|
|
29 |
->addAttributeToSelect("meta_title")
|
30 |
->addAttributeToSelect("meta_keyword")
|
31 |
->addStoreFilter();
|
32 |
-
|
33 |
$visibility = Mage::getStoreConfig('beezup/flux/visibility');
|
34 |
switch($visibility) {
|
35 |
case 1:
|
@@ -53,29 +53,29 @@
|
|
53 |
$products->addAttributeToFilter('visibility', array('in' => array(Mage_Catalog_Model_Product_Visibility::VISIBILITY_IN_CATALOG, Mage_Catalog_Model_Product_Visibility::VISIBILITY_BOTH)));
|
54 |
break;
|
55 |
}
|
56 |
-
|
57 |
if($configurable) $products->addAttributeToFilter('type_id', Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE);
|
58 |
-
|
59 |
if(Mage::getStoreConfig('beezup/flux/stock')){
|
60 |
Mage::getSingleton('cataloginventory/stock')->addInStockFilterToCollection($products);
|
61 |
//$products= $products->joinField('inventory_in_stock', 'cataloginventory_stock_item', 'is_in_stock', 'product_id=entity_id','is_in_stock>=0', 'left')
|
62 |
//->addAttributeToFilter('inventory_in_stock', array('neq' => 0));
|
63 |
}
|
64 |
-
|
65 |
$attributes = explode(',', Mage::getStoreConfig('beezup/flux/attributes'));
|
66 |
foreach ($attributes as $a) $products->addAttributeToSelect($a);
|
67 |
-
|
68 |
if (Mage::getStoreConfig('beezup/flux/debug_flux')) $products->setPageSize(10);
|
69 |
-
|
70 |
if($pagination) {
|
71 |
-
|
72 |
$products->setPageSize((int)$pagination['limit'])->setCurPage((int)$pagination['page']);
|
73 |
-
|
74 |
}
|
75 |
-
|
76 |
return $products;
|
77 |
}
|
78 |
-
|
79 |
public function getGroupedProduct()
|
80 |
{
|
81 |
$products = Mage::getModel('catalog/product')
|
@@ -88,10 +88,10 @@
|
|
88 |
->addAttributeToSelect('small_image')
|
89 |
->addAttributeToSelect('image')
|
90 |
->addAttributeToFilter('type_id', array('eq' => 'grouped'));
|
91 |
-
|
92 |
return $products;
|
93 |
}
|
94 |
-
|
95 |
public function getProductsSimple($pagination= false)
|
96 |
{
|
97 |
$products = Mage::getResourceModel('catalog/product_collection')
|
@@ -112,7 +112,7 @@
|
|
112 |
->addAttributeToSelect("meta_title")
|
113 |
->addAttributeToSelect("meta_keyword")
|
114 |
->addStoreFilter();
|
115 |
-
|
116 |
$visibility = Mage::getStoreConfig('beezup/flux/visibility');
|
117 |
switch($visibility) {
|
118 |
case 1:
|
@@ -136,29 +136,29 @@
|
|
136 |
$products->addAttributeToFilter('visibility', array('in' => array(Mage_Catalog_Model_Product_Visibility::VISIBILITY_IN_CATALOG, Mage_Catalog_Model_Product_Visibility::VISIBILITY_BOTH)));
|
137 |
break;
|
138 |
}
|
139 |
-
|
140 |
-
|
141 |
-
$products->addAttributeToFilter('type_id', Mage_Catalog_Model_Product_Type::TYPE_SIMPLE);
|
142 |
-
|
143 |
if(Mage::getStoreConfig('beezup/flux/stock')){
|
144 |
Mage::getSingleton('cataloginventory/stock')->addInStockFilterToCollection($products);
|
145 |
//$products= $products->joinField('inventory_in_stock', 'cataloginventory_stock_item', 'is_in_stock', 'product_id=entity_id','is_in_stock>=0', 'left')
|
146 |
//->addAttributeToFilter('inventory_in_stock', array('neq' => 0));
|
147 |
}
|
148 |
-
|
149 |
$attributes = explode(',', Mage::getStoreConfig('beezup/flux/attributes'));
|
150 |
foreach ($attributes as $a) $products->addAttributeToSelect($a);
|
151 |
-
|
152 |
if (Mage::getStoreConfig('beezup/flux/debug_flux')) $products->setPageSize(10);
|
153 |
-
|
154 |
if($pagination) {
|
155 |
$products->setPageSize($pagination['limit'])->setCurPage($pagination['page']);
|
156 |
-
|
157 |
}
|
158 |
-
|
159 |
return $products;
|
160 |
}
|
161 |
-
|
162 |
/*
|
163 |
* Retrieve configurable products collection
|
164 |
*
|
@@ -183,59 +183,59 @@
|
|
183 |
->addAttributeToSelect("meta_title")
|
184 |
->addAttributeToSelect("meta_keyword")
|
185 |
->addStoreFilter();
|
186 |
-
|
187 |
if(Mage::getStoreConfig('beezup/flux/stock')){
|
188 |
Mage::getSingleton('cataloginventory/stock')->addInStockFilterToCollection($products);
|
189 |
//$products= $products->joinField('inventory_in_stock', 'cataloginventory_stock_item', 'is_in_stock', 'product_id=entity_id','is_in_stock>=0', 'left')
|
190 |
//->addAttributeToFilter('inventory_in_stock', array('neq' => 0));
|
191 |
}
|
192 |
-
|
193 |
$attributes = explode(',', Mage::getStoreConfig('beezup/flux/attributes'));
|
194 |
foreach ($attributes as $a) $products->addAttributeToSelect($a);
|
195 |
-
|
196 |
if($pagination) {
|
197 |
$products->setPageSize($pagination['limit'])->setCurPage($pagination['page']);
|
198 |
}
|
199 |
-
|
200 |
$productsArray = $products;
|
201 |
-
|
202 |
-
//si on est dans le cas o� on veut les p�res et les fils
|
203 |
if($config){
|
204 |
$productsArray = array();
|
205 |
-
|
206 |
foreach($products as $p) {
|
207 |
$productsArray[$p->getParentId()][] = $p;
|
208 |
}
|
209 |
}
|
210 |
-
|
211 |
return $productsArray;
|
212 |
}
|
213 |
-
|
214 |
-
|
215 |
/*
|
216 |
* Collect options applicable to the configurable product for Varation Theme
|
217 |
*
|
218 |
* @param Mage_Catalog_Model_Product $product
|
219 |
* @return String
|
220 |
*/
|
221 |
-
|
222 |
public function getOptions($product) {
|
223 |
$childs = $this->getConfigurableProducts();
|
224 |
-
|
225 |
//si c'est un parent
|
226 |
if(isset($childs[$product->getId()])) {
|
227 |
$productAttributeOptions = $product->getTypeInstance(true)->getConfigurableAttributesAsArray($product);
|
228 |
-
|
229 |
$attributeOptions = array();
|
230 |
-
|
231 |
foreach ($productAttributeOptions as $productAttribute) {
|
232 |
$attributeOptions[] = ucfirst($productAttribute['attribute_code']);
|
233 |
}
|
234 |
-
|
235 |
return implode('',$attributeOptions);
|
236 |
}
|
237 |
}
|
238 |
-
|
239 |
/*
|
240 |
* Retrieve products stock
|
241 |
*
|
@@ -256,7 +256,7 @@
|
|
256 |
}
|
257 |
return $qty;
|
258 |
}
|
259 |
-
|
260 |
/*
|
261 |
* Retrieve product shipping amount
|
262 |
*
|
@@ -267,7 +267,7 @@
|
|
267 |
public function getShippingAmount($weight, $tablerates)
|
268 |
{
|
269 |
$shipping_amount = 0;
|
270 |
-
|
271 |
if ($tablerates && $tablerates instanceof Mage_Shipping_Model_Mysql4_Carrier_Tablerate_Collection) {
|
272 |
foreach ($tablerates as $t) {
|
273 |
if ($weight <= $t->getConditionValue()) $shipping_amount = $t->getPrice();
|
@@ -278,7 +278,7 @@
|
|
278 |
}
|
279 |
return $shipping_amount;
|
280 |
}
|
281 |
-
|
282 |
/*
|
283 |
* Retrieve Tablerates
|
284 |
*
|
@@ -288,7 +288,7 @@
|
|
288 |
{
|
289 |
return Mage::getResourceModel('shipping/carrier_tablerate_collection')->setOrder('condition_value', 'desc');
|
290 |
}
|
291 |
-
|
292 |
/*
|
293 |
* Retrieve product is in stock
|
294 |
*
|
@@ -299,7 +299,7 @@
|
|
299 |
{
|
300 |
return ($qty > 0) ? Mage::helper('beezup')->__('In Stock') : Mage::helper('beezup')->__('Out of Stock');
|
301 |
}
|
302 |
-
|
303 |
/*
|
304 |
* Retrieve product delivery
|
305 |
*
|
@@ -310,7 +310,37 @@
|
|
310 |
{
|
311 |
return ($qty > 0) ? Mage::getStoreConfig('beezup/flux/days_in') : Mage::getStoreConfig('beezup/flux/days_out');
|
312 |
}
|
313 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
314 |
/*
|
315 |
* Retrieve store categories as array (recursive)
|
316 |
*
|
@@ -327,31 +357,31 @@
|
|
327 |
$tl_name = '';
|
328 |
$_categories = $categories;
|
329 |
foreach($_categories as $_category){
|
330 |
-
|
331 |
if($i==0 ) {
|
332 |
$par_cat = Mage::getModel('catalog/category')->load($_category->getId())->getParentCategory();
|
333 |
-
|
334 |
$cats[$par_cat->getId()] = array("name" => $tl_name.$par_cat->getName(), "id" => $par_cat->getId(), "parent" => $par_cat->getParentId());
|
335 |
}
|
336 |
-
|
337 |
-
|
338 |
//$_category = Mage::getModel('catalog/category')->load($_category->getId());
|
339 |
$cats[$_category->getId()] = array("name" => $tl_name.$_category->getName(), "id" => $_category->getId(), "parent" => $_category->getParentId() ); //Toplevel auslesen
|
340 |
$i++;
|
341 |
$_category = Mage::getModel('catalog/category')->load($_category->getId());
|
342 |
$subcats = $this->getChildCategories($_category);
|
343 |
-
|
344 |
foreach($subcats as $c) {
|
345 |
-
|
346 |
$cats[$c['id']] = array("name" => $tl_name.$c['name'], "id" => $c['id'] , "parent" => $c['parent']);
|
347 |
-
}
|
348 |
}
|
349 |
return $cats;
|
350 |
-
|
351 |
} else {
|
352 |
foreach ($categories as $c) {
|
353 |
$cats[$c['entity_id']] = $parent . $c['name'];
|
354 |
-
|
355 |
if (!Mage::helper('catalog/category_flat')->isEnabled()) {
|
356 |
if ($childs = $c->getChildren()) {
|
357 |
$this->getCategoriesAsArray($childs, $logic, $parent . $c['name'] . '||', $cats);
|
@@ -365,8 +395,8 @@
|
|
365 |
}
|
366 |
return $cats;
|
367 |
}
|
368 |
-
|
369 |
-
|
370 |
public $_catIds = array();
|
371 |
public function getChildCategories($categoryObject){
|
372 |
$categories = $categoryObject->getChildrenCategories();
|
@@ -378,7 +408,7 @@
|
|
378 |
}
|
379 |
return $this->_catIds;
|
380 |
}
|
381 |
-
|
382 |
/*
|
383 |
* Retrieve product categories
|
384 |
*
|
@@ -388,26 +418,27 @@
|
|
388 |
*/
|
389 |
public function getProductsCategories($product,$categories)
|
390 |
{
|
391 |
-
|
392 |
-
|
393 |
$_categories = $product->getCategoryIds();
|
394 |
-
|
395 |
sort($_categories);
|
396 |
$result = array();
|
397 |
if(count($_categories)) {
|
398 |
$_count = 0;
|
399 |
foreach($_categories as $c) {
|
400 |
if(isset($categories[$c])) {
|
401 |
-
|
|
|
402 |
$_count = count($result);
|
403 |
}
|
404 |
}
|
405 |
}
|
406 |
-
|
407 |
return $result;
|
408 |
}
|
409 |
-
|
410 |
-
|
411 |
/*
|
412 |
* Retrieve product categories
|
413 |
*
|
@@ -423,17 +454,17 @@
|
|
423 |
$parent_id = 0;
|
424 |
$i = 0;
|
425 |
sort($_categories);
|
426 |
-
|
427 |
if(count($_categories)) {
|
428 |
$_count = 0;
|
429 |
foreach($_categories as $c) {
|
430 |
if(isset($categories[$c])) {
|
431 |
if( $parent_id == $categories[$c]['parent'] || $i <= 1) {
|
432 |
$result[] = $categories[$c]['name'];
|
433 |
-
|
434 |
-
|
435 |
$parent_id = $categories[$c]['id'];
|
436 |
-
|
437 |
}
|
438 |
$i++;
|
439 |
// if(count(explode('||',$categories[$c])) > $_count) $result = explode('||',$categories[$c]);
|
@@ -443,8 +474,8 @@
|
|
443 |
}
|
444 |
return $result;
|
445 |
}
|
446 |
-
|
447 |
-
|
448 |
/*
|
449 |
* Retrieve current store
|
450 |
*
|
@@ -454,18 +485,18 @@
|
|
454 |
{
|
455 |
return Mage::app()->getStore();
|
456 |
}
|
457 |
-
|
458 |
-
|
459 |
-
|
460 |
-
|
461 |
-
|
462 |
/**
|
463 |
* Get shipping price
|
464 |
*
|
465 |
* @param Mage_Catalog_Model_Product $product_instance
|
466 |
* @param string $carrierValue
|
467 |
-
* @param string $countryCode
|
468 |
-
*
|
469 |
* @return mixed
|
470 |
*/
|
471 |
public function _getShippingPrice($product_instance, $carrierValue, $countryCode = 'FR')
|
@@ -490,13 +521,13 @@
|
|
490 |
}
|
491 |
return 0;
|
492 |
}
|
493 |
-
|
494 |
/**
|
495 |
* Get Shipping rate request
|
496 |
*
|
497 |
* @param Mage_Catalog_Model_Product $product_instance
|
498 |
-
* @param string $countryCode
|
499 |
-
*
|
500 |
* @return Mage_Shipping_Model_Rate_Request
|
501 |
*/
|
502 |
protected function _getShippingRateRequest($product_instance, $countryCode = 'FR')
|
@@ -530,6 +561,6 @@
|
|
530 |
$request->setPackageCurrency(Mage::app()->getStore()->getCurrentCurrency());
|
531 |
return $request;
|
532 |
}
|
533 |
-
|
534 |
-
|
535 |
-
}
|
1 |
<?php
|
2 |
+
|
3 |
class BeezUp_Model_Products extends Mage_Core_Model_Abstract
|
4 |
{
|
5 |
+
|
6 |
/*
|
7 |
* Retrieve products collection
|
8 |
*
|
29 |
->addAttributeToSelect("meta_title")
|
30 |
->addAttributeToSelect("meta_keyword")
|
31 |
->addStoreFilter();
|
32 |
+
|
33 |
$visibility = Mage::getStoreConfig('beezup/flux/visibility');
|
34 |
switch($visibility) {
|
35 |
case 1:
|
53 |
$products->addAttributeToFilter('visibility', array('in' => array(Mage_Catalog_Model_Product_Visibility::VISIBILITY_IN_CATALOG, Mage_Catalog_Model_Product_Visibility::VISIBILITY_BOTH)));
|
54 |
break;
|
55 |
}
|
56 |
+
|
57 |
if($configurable) $products->addAttributeToFilter('type_id', Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE);
|
58 |
+
|
59 |
if(Mage::getStoreConfig('beezup/flux/stock')){
|
60 |
Mage::getSingleton('cataloginventory/stock')->addInStockFilterToCollection($products);
|
61 |
//$products= $products->joinField('inventory_in_stock', 'cataloginventory_stock_item', 'is_in_stock', 'product_id=entity_id','is_in_stock>=0', 'left')
|
62 |
//->addAttributeToFilter('inventory_in_stock', array('neq' => 0));
|
63 |
}
|
64 |
+
|
65 |
$attributes = explode(',', Mage::getStoreConfig('beezup/flux/attributes'));
|
66 |
foreach ($attributes as $a) $products->addAttributeToSelect($a);
|
67 |
+
|
68 |
if (Mage::getStoreConfig('beezup/flux/debug_flux')) $products->setPageSize(10);
|
69 |
+
|
70 |
if($pagination) {
|
71 |
+
|
72 |
$products->setPageSize((int)$pagination['limit'])->setCurPage((int)$pagination['page']);
|
73 |
+
|
74 |
}
|
75 |
+
|
76 |
return $products;
|
77 |
}
|
78 |
+
|
79 |
public function getGroupedProduct()
|
80 |
{
|
81 |
$products = Mage::getModel('catalog/product')
|
88 |
->addAttributeToSelect('small_image')
|
89 |
->addAttributeToSelect('image')
|
90 |
->addAttributeToFilter('type_id', array('eq' => 'grouped'));
|
91 |
+
|
92 |
return $products;
|
93 |
}
|
94 |
+
|
95 |
public function getProductsSimple($pagination= false)
|
96 |
{
|
97 |
$products = Mage::getResourceModel('catalog/product_collection')
|
112 |
->addAttributeToSelect("meta_title")
|
113 |
->addAttributeToSelect("meta_keyword")
|
114 |
->addStoreFilter();
|
115 |
+
|
116 |
$visibility = Mage::getStoreConfig('beezup/flux/visibility');
|
117 |
switch($visibility) {
|
118 |
case 1:
|
136 |
$products->addAttributeToFilter('visibility', array('in' => array(Mage_Catalog_Model_Product_Visibility::VISIBILITY_IN_CATALOG, Mage_Catalog_Model_Product_Visibility::VISIBILITY_BOTH)));
|
137 |
break;
|
138 |
}
|
139 |
+
|
140 |
+
|
141 |
+
$products->addAttributeToFilter('type_id', Mage_Catalog_Model_Product_Type::TYPE_SIMPLE);
|
142 |
+
|
143 |
if(Mage::getStoreConfig('beezup/flux/stock')){
|
144 |
Mage::getSingleton('cataloginventory/stock')->addInStockFilterToCollection($products);
|
145 |
//$products= $products->joinField('inventory_in_stock', 'cataloginventory_stock_item', 'is_in_stock', 'product_id=entity_id','is_in_stock>=0', 'left')
|
146 |
//->addAttributeToFilter('inventory_in_stock', array('neq' => 0));
|
147 |
}
|
148 |
+
|
149 |
$attributes = explode(',', Mage::getStoreConfig('beezup/flux/attributes'));
|
150 |
foreach ($attributes as $a) $products->addAttributeToSelect($a);
|
151 |
+
|
152 |
if (Mage::getStoreConfig('beezup/flux/debug_flux')) $products->setPageSize(10);
|
153 |
+
|
154 |
if($pagination) {
|
155 |
$products->setPageSize($pagination['limit'])->setCurPage($pagination['page']);
|
156 |
+
|
157 |
}
|
158 |
+
|
159 |
return $products;
|
160 |
}
|
161 |
+
|
162 |
/*
|
163 |
* Retrieve configurable products collection
|
164 |
*
|
183 |
->addAttributeToSelect("meta_title")
|
184 |
->addAttributeToSelect("meta_keyword")
|
185 |
->addStoreFilter();
|
186 |
+
|
187 |
if(Mage::getStoreConfig('beezup/flux/stock')){
|
188 |
Mage::getSingleton('cataloginventory/stock')->addInStockFilterToCollection($products);
|
189 |
//$products= $products->joinField('inventory_in_stock', 'cataloginventory_stock_item', 'is_in_stock', 'product_id=entity_id','is_in_stock>=0', 'left')
|
190 |
//->addAttributeToFilter('inventory_in_stock', array('neq' => 0));
|
191 |
}
|
192 |
+
|
193 |
$attributes = explode(',', Mage::getStoreConfig('beezup/flux/attributes'));
|
194 |
foreach ($attributes as $a) $products->addAttributeToSelect($a);
|
195 |
+
|
196 |
if($pagination) {
|
197 |
$products->setPageSize($pagination['limit'])->setCurPage($pagination['page']);
|
198 |
}
|
199 |
+
|
200 |
$productsArray = $products;
|
201 |
+
|
202 |
+
//si on est dans le cas o� on veut les p�res et les fils
|
203 |
if($config){
|
204 |
$productsArray = array();
|
205 |
+
|
206 |
foreach($products as $p) {
|
207 |
$productsArray[$p->getParentId()][] = $p;
|
208 |
}
|
209 |
}
|
210 |
+
|
211 |
return $productsArray;
|
212 |
}
|
213 |
+
|
214 |
+
|
215 |
/*
|
216 |
* Collect options applicable to the configurable product for Varation Theme
|
217 |
*
|
218 |
* @param Mage_Catalog_Model_Product $product
|
219 |
* @return String
|
220 |
*/
|
221 |
+
|
222 |
public function getOptions($product) {
|
223 |
$childs = $this->getConfigurableProducts();
|
224 |
+
|
225 |
//si c'est un parent
|
226 |
if(isset($childs[$product->getId()])) {
|
227 |
$productAttributeOptions = $product->getTypeInstance(true)->getConfigurableAttributesAsArray($product);
|
228 |
+
|
229 |
$attributeOptions = array();
|
230 |
+
|
231 |
foreach ($productAttributeOptions as $productAttribute) {
|
232 |
$attributeOptions[] = ucfirst($productAttribute['attribute_code']);
|
233 |
}
|
234 |
+
|
235 |
return implode('',$attributeOptions);
|
236 |
}
|
237 |
}
|
238 |
+
|
239 |
/*
|
240 |
* Retrieve products stock
|
241 |
*
|
256 |
}
|
257 |
return $qty;
|
258 |
}
|
259 |
+
|
260 |
/*
|
261 |
* Retrieve product shipping amount
|
262 |
*
|
267 |
public function getShippingAmount($weight, $tablerates)
|
268 |
{
|
269 |
$shipping_amount = 0;
|
270 |
+
|
271 |
if ($tablerates && $tablerates instanceof Mage_Shipping_Model_Mysql4_Carrier_Tablerate_Collection) {
|
272 |
foreach ($tablerates as $t) {
|
273 |
if ($weight <= $t->getConditionValue()) $shipping_amount = $t->getPrice();
|
278 |
}
|
279 |
return $shipping_amount;
|
280 |
}
|
281 |
+
|
282 |
/*
|
283 |
* Retrieve Tablerates
|
284 |
*
|
288 |
{
|
289 |
return Mage::getResourceModel('shipping/carrier_tablerate_collection')->setOrder('condition_value', 'desc');
|
290 |
}
|
291 |
+
|
292 |
/*
|
293 |
* Retrieve product is in stock
|
294 |
*
|
299 |
{
|
300 |
return ($qty > 0) ? Mage::helper('beezup')->__('In Stock') : Mage::helper('beezup')->__('Out of Stock');
|
301 |
}
|
302 |
+
|
303 |
/*
|
304 |
* Retrieve product delivery
|
305 |
*
|
310 |
{
|
311 |
return ($qty > 0) ? Mage::getStoreConfig('beezup/flux/days_in') : Mage::getStoreConfig('beezup/flux/days_out');
|
312 |
}
|
313 |
+
|
314 |
+
|
315 |
+
|
316 |
+
|
317 |
+
|
318 |
+
public function getCategoryLogic1Tree($categories) {
|
319 |
+
|
320 |
+
$categorias = array();
|
321 |
+
if(isset($categories['items'])) {
|
322 |
+
$categories = $categories['items'];
|
323 |
+
}
|
324 |
+
foreach($categories as $category) {
|
325 |
+
$categorias[$category['entity_id']] = $category;
|
326 |
+
}
|
327 |
+
$retorno = array();
|
328 |
+
foreach($categorias as $key => $category) {
|
329 |
+
$paths = explode("/", $category['path']);
|
330 |
+
$categoryTree = array();
|
331 |
+
foreach($paths as $path) {
|
332 |
+
if(isset($categorias[$path])) {
|
333 |
+
if($categorias[$path]['entity_id'] > 2) {
|
334 |
+
$categoryTree[] = $categorias[$path]['name'];
|
335 |
+
}
|
336 |
+
}
|
337 |
+
}
|
338 |
+
$retorno[$key] = implode("||", $categoryTree);
|
339 |
+
}
|
340 |
+
|
341 |
+
return $retorno;
|
342 |
+
}
|
343 |
+
|
344 |
/*
|
345 |
* Retrieve store categories as array (recursive)
|
346 |
*
|
357 |
$tl_name = '';
|
358 |
$_categories = $categories;
|
359 |
foreach($_categories as $_category){
|
360 |
+
|
361 |
if($i==0 ) {
|
362 |
$par_cat = Mage::getModel('catalog/category')->load($_category->getId())->getParentCategory();
|
363 |
+
|
364 |
$cats[$par_cat->getId()] = array("name" => $tl_name.$par_cat->getName(), "id" => $par_cat->getId(), "parent" => $par_cat->getParentId());
|
365 |
}
|
366 |
+
|
367 |
+
|
368 |
//$_category = Mage::getModel('catalog/category')->load($_category->getId());
|
369 |
$cats[$_category->getId()] = array("name" => $tl_name.$_category->getName(), "id" => $_category->getId(), "parent" => $_category->getParentId() ); //Toplevel auslesen
|
370 |
$i++;
|
371 |
$_category = Mage::getModel('catalog/category')->load($_category->getId());
|
372 |
$subcats = $this->getChildCategories($_category);
|
373 |
+
|
374 |
foreach($subcats as $c) {
|
375 |
+
|
376 |
$cats[$c['id']] = array("name" => $tl_name.$c['name'], "id" => $c['id'] , "parent" => $c['parent']);
|
377 |
+
}
|
378 |
}
|
379 |
return $cats;
|
380 |
+
|
381 |
} else {
|
382 |
foreach ($categories as $c) {
|
383 |
$cats[$c['entity_id']] = $parent . $c['name'];
|
384 |
+
|
385 |
if (!Mage::helper('catalog/category_flat')->isEnabled()) {
|
386 |
if ($childs = $c->getChildren()) {
|
387 |
$this->getCategoriesAsArray($childs, $logic, $parent . $c['name'] . '||', $cats);
|
395 |
}
|
396 |
return $cats;
|
397 |
}
|
398 |
+
|
399 |
+
|
400 |
public $_catIds = array();
|
401 |
public function getChildCategories($categoryObject){
|
402 |
$categories = $categoryObject->getChildrenCategories();
|
408 |
}
|
409 |
return $this->_catIds;
|
410 |
}
|
411 |
+
|
412 |
/*
|
413 |
* Retrieve product categories
|
414 |
*
|
418 |
*/
|
419 |
public function getProductsCategories($product,$categories)
|
420 |
{
|
421 |
+
|
422 |
+
|
423 |
$_categories = $product->getCategoryIds();
|
424 |
+
|
425 |
sort($_categories);
|
426 |
$result = array();
|
427 |
if(count($_categories)) {
|
428 |
$_count = 0;
|
429 |
foreach($_categories as $c) {
|
430 |
if(isset($categories[$c])) {
|
431 |
+
$result = explode('||',$categories[$c]);
|
432 |
+
//if(count(explode('||',$categories[$c])) > $_count) $result = explode('||',$categories[$c]);
|
433 |
$_count = count($result);
|
434 |
}
|
435 |
}
|
436 |
}
|
437 |
+
|
438 |
return $result;
|
439 |
}
|
440 |
+
|
441 |
+
|
442 |
/*
|
443 |
* Retrieve product categories
|
444 |
*
|
454 |
$parent_id = 0;
|
455 |
$i = 0;
|
456 |
sort($_categories);
|
457 |
+
|
458 |
if(count($_categories)) {
|
459 |
$_count = 0;
|
460 |
foreach($_categories as $c) {
|
461 |
if(isset($categories[$c])) {
|
462 |
if( $parent_id == $categories[$c]['parent'] || $i <= 1) {
|
463 |
$result[] = $categories[$c]['name'];
|
464 |
+
|
465 |
+
|
466 |
$parent_id = $categories[$c]['id'];
|
467 |
+
|
468 |
}
|
469 |
$i++;
|
470 |
// if(count(explode('||',$categories[$c])) > $_count) $result = explode('||',$categories[$c]);
|
474 |
}
|
475 |
return $result;
|
476 |
}
|
477 |
+
|
478 |
+
|
479 |
/*
|
480 |
* Retrieve current store
|
481 |
*
|
485 |
{
|
486 |
return Mage::app()->getStore();
|
487 |
}
|
488 |
+
|
489 |
+
|
490 |
+
|
491 |
+
|
492 |
+
|
493 |
/**
|
494 |
* Get shipping price
|
495 |
*
|
496 |
* @param Mage_Catalog_Model_Product $product_instance
|
497 |
* @param string $carrierValue
|
498 |
+
* @param string $countryCode
|
499 |
+
*
|
500 |
* @return mixed
|
501 |
*/
|
502 |
public function _getShippingPrice($product_instance, $carrierValue, $countryCode = 'FR')
|
521 |
}
|
522 |
return 0;
|
523 |
}
|
524 |
+
|
525 |
/**
|
526 |
* Get Shipping rate request
|
527 |
*
|
528 |
* @param Mage_Catalog_Model_Product $product_instance
|
529 |
+
* @param string $countryCode
|
530 |
+
*
|
531 |
* @return Mage_Shipping_Model_Rate_Request
|
532 |
*/
|
533 |
protected function _getShippingRateRequest($product_instance, $countryCode = 'FR')
|
561 |
$request->setPackageCurrency(Mage::app()->getStore()->getCurrentCurrency());
|
562 |
return $request;
|
563 |
}
|
564 |
+
|
565 |
+
|
566 |
+
}
|
app/code/community/BeezUp/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<BeezUp>
|
5 |
-
<version>4.7.
|
6 |
</BeezUp>
|
7 |
</modules>
|
8 |
<global>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<BeezUp>
|
5 |
+
<version>4.7.6</version>
|
6 |
</BeezUp>
|
7 |
</modules>
|
8 |
<global>
|
app/code/community/BeezUp/etc/system.xml
CHANGED
@@ -44,7 +44,7 @@
|
|
44 |
<tracking translate="label">
|
45 |
<label>Tracking</label>
|
46 |
<frontend_type>text</frontend_type>
|
47 |
-
<comment><![CDATA[<div style="font-size:11px;padding:3px;margin-bottom:20px;background:#FFF9E9;border:1px solid #EEE2BE">Support BeezUP : <a href="mailto:help@beezup.com">help@beezup.com</a> (Magento BeezUP v4.7.
|
48 |
<sort_order>1</sort_order>
|
49 |
<show_in_default>1</show_in_default>
|
50 |
<show_in_website>1</show_in_website>
|
@@ -108,7 +108,7 @@
|
|
108 |
<marketplace tanslate="label">
|
109 |
<label>Marketplace</label>
|
110 |
<frontend_type>text</frontend_type>
|
111 |
-
<comment><![CDATA[<div style="font-size:11px;padding:3px;margin-bottom:20px;background:#FFF9E9;border:1px solid #EEE2BE">Support BeezUP : <a href="mailto:help@beezup.com">help@beezup.com</a> (Magento BeezUP v4.7.
|
112 |
<sort_order>2</sort_order>
|
113 |
<show_in_default>1</show_in_default>
|
114 |
<show_in_website>1</show_in_website>
|
@@ -509,7 +509,7 @@
|
|
509 |
<flux translate="label">
|
510 |
<label>Catalog Flow</label>
|
511 |
<frontend_type>text</frontend_type>
|
512 |
-
<comment><![CDATA[<div style="font-size:11px;padding:3px;margin-bottom:20px;background:#FFF9E9;border:1px solid #EEE2BE">Support BeezUP : <a href="mailto:help@beezup.com">help@beezup.com</a> (Magento BeezUP v4.7.
|
513 |
<sort_order>2</sort_order>
|
514 |
<show_in_default>1</show_in_default>
|
515 |
<show_in_website>1</show_in_website>
|
44 |
<tracking translate="label">
|
45 |
<label>Tracking</label>
|
46 |
<frontend_type>text</frontend_type>
|
47 |
+
<comment><![CDATA[<div style="font-size:11px;padding:3px;margin-bottom:20px;background:#FFF9E9;border:1px solid #EEE2BE">Support BeezUP : <a href="mailto:help@beezup.com">help@beezup.com</a> (Magento BeezUP v4.7.6) - <a href="http://go.beezup.com" target="_blank">My BeezUP Account</a></div>]]></comment>
|
48 |
<sort_order>1</sort_order>
|
49 |
<show_in_default>1</show_in_default>
|
50 |
<show_in_website>1</show_in_website>
|
108 |
<marketplace tanslate="label">
|
109 |
<label>Marketplace</label>
|
110 |
<frontend_type>text</frontend_type>
|
111 |
+
<comment><![CDATA[<div style="font-size:11px;padding:3px;margin-bottom:20px;background:#FFF9E9;border:1px solid #EEE2BE">Support BeezUP : <a href="mailto:help@beezup.com">help@beezup.com</a> (Magento BeezUP v4.7.6) - <a href="http://go.beezup.com" target="_blank">My BeezUP Account</a></div>]]></comment>
|
112 |
<sort_order>2</sort_order>
|
113 |
<show_in_default>1</show_in_default>
|
114 |
<show_in_website>1</show_in_website>
|
509 |
<flux translate="label">
|
510 |
<label>Catalog Flow</label>
|
511 |
<frontend_type>text</frontend_type>
|
512 |
+
<comment><![CDATA[<div style="font-size:11px;padding:3px;margin-bottom:20px;background:#FFF9E9;border:1px solid #EEE2BE">Support BeezUP : <a href="mailto:help@beezup.com">help@beezup.com</a> (Magento BeezUP v4.7.6) - <a href="http://go.beezup.com" target="_blank">My BeezUP Account</a></div>]]></comment>
|
513 |
<sort_order>2</sort_order>
|
514 |
<show_in_default>1</show_in_default>
|
515 |
<show_in_website>1</show_in_website>
|
app/design/adminhtml/default/default/template/beezup/custom.phtml
CHANGED
@@ -3,10 +3,10 @@
|
|
3 |
<h4><?php echo $this->__('BeezUP Info'); ?></h4>
|
4 |
</div>
|
5 |
<div class="fieldset fieldset-wide">
|
6 |
-
|
7 |
-
<?php
|
8 |
$order = $this->getOrder();
|
9 |
-
|
10 |
$shipment_collection = Mage::getResourceModel('sales/order_shipment_collection')
|
11 |
->setOrderFilter($order)
|
12 |
->load();
|
@@ -18,32 +18,35 @@
|
|
18 |
$shipping_data['tracking'] = $tracking_number->getNumber();
|
19 |
$shipping_data['carrier'] = $tracking_number->getTitle();
|
20 |
break;
|
21 |
-
}
|
22 |
break;
|
23 |
}
|
24 |
-
|
25 |
$blnBeezup = false;
|
26 |
$base_url = $url = Mage::getBaseUrl( Mage_Core_Model_Store::URL_TYPE_WEB, true );
|
27 |
-
|
28 |
$resource = Mage::getSingleton('core/resource');
|
29 |
$readConnection = $resource->getConnection('core_read');
|
30 |
$table = $resource->getTableName('sales/order_grid');
|
31 |
$query = 'SELECT * FROM ' . $table . ' WHERE beezup_order = 1 and entity_id = \''
|
32 |
-
. $order->getId() . '\' LIMIT 1';
|
33 |
$results = $readConnection->fetchAll($query);
|
34 |
//var_dump($results);
|
35 |
if($results[0]['beezup_order'] == 1) {
|
36 |
$blnBeezup = true;
|
37 |
-
|
38 |
$date = new DateTime($results[0]['beezup_marketplace_last_modification_date']);
|
39 |
$beezup_marketplace_last_modification_date = $date->format('d-m-Y H:i:s'). " (UTC Time)";
|
40 |
-
|
41 |
$date2 = new DateTime($results[0]['beezup_purchase_date']);
|
42 |
$beezup_purchase_date = $date2->format('d-m-Y H:i:s'). " (UTC Time)";
|
43 |
-
|
44 |
$date3 = new DateTime($results[0]['beezup_last_modification_date']);
|
45 |
$beezup_last_modification_date = $date3->format('d-m-Y H:i:s'). " (UTC Time)";
|
46 |
-
|
|
|
|
|
|
|
47 |
echo "<strong>".Mage::helper('beezup')->__('BeezUP Order Id:')." </strong> ".$results[0]['beezup_order_id']."<br>";
|
48 |
echo "<strong>".Mage::helper('beezup')->__('BeezUP Status:')." </strong> ".$results[0]['beezup_status']."<br>";
|
49 |
echo "<strong>".Mage::helper('beezup')->__('BeezUP Last Modification Date:')." </strong> ".$beezup_last_modification_date."<br>";
|
@@ -58,39 +61,39 @@
|
|
58 |
}
|
59 |
echo "<strong>".Mage::helper('beezup')->__('BeezUP Order Link:')." </strong> <a href='https://go.beezup.com/OrderManagement/Informations?BeezUPOrderUUId=".$results[0]['beezup_order_id']."&MarketplaceTechnicalCode=".$results[0]['beezup_marketplace']."&AccountId=".$results[0]['beezup_name']."' target='_blank'>https://go.beezup.com/OrderManagement/Informations?BeezUPOrderUUId=".$results[0]['beezup_order_id']."&MarketplaceTechnicalCode=".$results[0]['beezup_marketplace']."&AccountId=".$results[0]['beezup_name']."</a><br>";
|
60 |
} else {
|
61 |
-
|
62 |
echo Mage::helper('beezup')->__('No data here, since it\'s not an order coming from BeezUP');
|
63 |
}
|
64 |
-
|
65 |
?>
|
66 |
-
|
67 |
</div>
|
68 |
</div>
|
69 |
<?php if($blnBeezup) {
|
70 |
$firstname = Mage::getSingleton('admin/session')->getUser()->getFirstname();
|
71 |
$lastname = Mage::getSingleton('admin/session')->getUser()->getLastname();
|
72 |
$username = $firstname." ".$lastname;
|
73 |
-
|
74 |
$helper = Mage::helper('beezup');
|
75 |
$userid = $helper->getConfig('beezup/marketplace/userid');
|
76 |
$usertoken = $helper->getConfig('beezup/marketplace/usertoken');
|
77 |
$order_actions = $this->getBeezupInfo($order->getId());
|
78 |
?>
|
79 |
-
|
80 |
-
|
81 |
<style>
|
82 |
#acciones {
|
83 |
-
|
84 |
width: 80%;
|
85 |
float: left;
|
86 |
-
|
87 |
}
|
88 |
.calendar {
|
89 |
left: 40% !important;
|
90 |
position:fixed !Important;
|
91 |
top: 31% !Important;
|
92 |
z-index: 999999999 !Important;
|
93 |
-
|
94 |
}
|
95 |
.beezup-modal-dialog {
|
96 |
visibility:hidden;
|
@@ -98,7 +101,7 @@
|
|
98 |
left: 0px;
|
99 |
top: 20%;
|
100 |
width: 30%;
|
101 |
-
|
102 |
text-align: center;
|
103 |
z-index: 1000;
|
104 |
border: 2px solid gray;
|
@@ -135,28 +138,28 @@
|
|
135 |
top: 0;
|
136 |
left: 0;
|
137 |
z-index: 9999;
|
138 |
-
|
139 |
}
|
140 |
</style>
|
141 |
-
|
142 |
<div id="fondo"></div>
|
143 |
<div class="entry-edit">
|
144 |
<div class="entry-edit-head">
|
145 |
<h4><?php echo $this->__('BeezUP Order Status'); ?></h4>
|
146 |
-
</div>
|
147 |
<div class="fieldset fieldset-wide">
|
148 |
<div class="alert" id="msgAlert" style="display:none;padding: 10px;background-color: lightgrey; color:white;margin-bottom: 10px;"></div>
|
149 |
<div id="acciones">
|
150 |
-
<?php
|
151 |
if($order_actions['is_pending'] == false) {
|
152 |
-
foreach($order_actions as $key => $action) {
|
153 |
if(isset($action['action'])) {
|
154 |
$label = preg_replace('/(?<!\ )[A-Z]/', ' $0', $action['action']);
|
155 |
?>
|
156 |
-
|
157 |
<button class="button" style="background:gray;border-color:gray;" onclick="overlay('<?php echo $action['action'];?>');"><?php echo $label;?></button>
|
158 |
-
|
159 |
-
|
160 |
<div id="overlay_<?php echo $action['action'];?>" class="beezup-modal-dialog">
|
161 |
<div>
|
162 |
<span class="popup-close" onclick="overlay('<?php echo $action['action'];?>');">X</span>
|
@@ -167,60 +170,60 @@
|
|
167 |
<?php $inputs = $this->generateInput($action['parameters'], $shipping_data);
|
168 |
echo $inputs;
|
169 |
?>
|
170 |
-
|
171 |
</div>
|
172 |
<div id="submitBtn-<?php echo $action['action'];?>" style=" float: right;margin-right: 25px;"><button type="button" onclick="updateOrder('<?php echo $action['action'];?>');" class="button" name="submit" ><?php echo Mage::helper('beezup')->__('Update');?></button></div>
|
173 |
</form>
|
174 |
</div>
|
175 |
</div>
|
176 |
-
|
177 |
<?php }
|
178 |
} } else {?>
|
179 |
-
|
180 |
<div style="padding: 10px;background-color: lightgrey; margin-bottom: 10px;"><?php echo Mage::helper('beezup')->__('Order is syncronizing, please resync within a few mins to get updated info');?></div>
|
181 |
-
|
182 |
<?php } ?>
|
183 |
</div>
|
184 |
-
|
185 |
<button class="button" style="float:right;" onclick="resync();"><?php echo Mage::helper('beezup')->__('Resync Order');?></button>
|
186 |
<div id="ajax-loader" style="display:none;float:right;"><img src="<?php echo $base_url."/beezup/omstatus/loader";?>" /></div>
|
187 |
<br>
|
188 |
<div id="statusLoad" style="margin-top:15px;">
|
189 |
</div>
|
190 |
-
|
191 |
-
|
192 |
-
|
193 |
</div>
|
194 |
-
|
195 |
</div>
|
196 |
-
|
197 |
-
|
198 |
<script>
|
199 |
var ajax = {};
|
200 |
ajax.x = function() {
|
201 |
if (typeof XMLHttpRequest !== 'undefined') {
|
202 |
-
return new XMLHttpRequest();
|
203 |
}
|
204 |
var versions = [
|
205 |
"MSXML2.XmlHttp.6.0",
|
206 |
-
"MSXML2.XmlHttp.5.0",
|
207 |
-
"MSXML2.XmlHttp.4.0",
|
208 |
-
"MSXML2.XmlHttp.3.0",
|
209 |
-
"MSXML2.XmlHttp.2.0",
|
210 |
"Microsoft.XmlHttp"
|
211 |
];
|
212 |
-
|
213 |
var xhr;
|
214 |
-
for(var i = 0; i < versions.length; i++) {
|
215 |
-
try {
|
216 |
-
xhr = new ActiveXObject(versions[i]);
|
217 |
-
break;
|
218 |
} catch (e) {
|
219 |
-
}
|
220 |
}
|
221 |
return xhr;
|
222 |
};
|
223 |
-
|
224 |
ajax.send = function(url, callback, method, data, sync) {
|
225 |
var x = ajax.x();
|
226 |
x.open(method, url, sync);
|
@@ -234,7 +237,7 @@
|
|
234 |
}
|
235 |
x.send(data)
|
236 |
};
|
237 |
-
|
238 |
ajax.get = function(url, data, callback, sync) {
|
239 |
var query = [];
|
240 |
for (var key in data) {
|
@@ -242,7 +245,7 @@
|
|
242 |
}
|
243 |
ajax.send(url + (query.length ? '?' + query.join('&') : ''), callback, 'GET', null, sync)
|
244 |
};
|
245 |
-
|
246 |
ajax.post = function(url, data, callback, sync) {
|
247 |
var query = [];
|
248 |
for (var key in data) {
|
@@ -250,37 +253,37 @@
|
|
250 |
}
|
251 |
ajax.send(url, callback, 'POST', query.join('&'), sync)
|
252 |
};
|
253 |
-
|
254 |
-
|
255 |
-
|
256 |
function resync() {
|
257 |
document.getElementById("ajax-loader").style.display="block";
|
258 |
-
|
259 |
-
setTimeout(function () {
|
260 |
ajax.get('<?php echo $base_url."beezup/omstatus/resync";?>', {order_id : <?php echo $order->getId();?>, uid : '<?php echo $userid;?>', token : '<?php echo $usertoken;?>'}, function(response) {
|
261 |
document.getElementById("msgAlert").innerHTML = '';
|
262 |
document.getElementById("msgAlert").style.display = "block";
|
263 |
-
|
264 |
document.getElementById("ajax-loader").style.display="none";
|
265 |
if(response == 1) {
|
266 |
document.getElementById("msgAlert").innerHTML = '<?php echo Mage::helper('beezup')->__("Updated Order Ok page will refresh in 2 secc");?>';
|
267 |
document.getElementById("msgAlert").style.backgroundColor = "green";
|
268 |
-
|
269 |
setTimeout(function () { window.location='window.location.href'; } , 2000);
|
270 |
} else if(response == 2) {
|
271 |
document.getElementById("msgAlert").innerHTML = '<?php echo Mage::helper('beezup')->__('Order has been refreshed with no change');?>';
|
272 |
document.getElementById("msgAlert").style.backgroundColor = "orange";
|
273 |
-
|
274 |
} else {
|
275 |
document.getElementById("msgAlert").innerHTML = '<?php echo Mage::helper('beezup')->__("Order is syncronizing, please resync within a few mins to get updated info");?>';
|
276 |
document.getElementById("msgAlert").style.backgroundColor = "orange";
|
277 |
-
|
278 |
-
|
279 |
}
|
280 |
-
|
281 |
});
|
282 |
-
|
283 |
-
|
284 |
}, 1000);
|
285 |
}
|
286 |
function overlay(action) {
|
@@ -289,8 +292,8 @@
|
|
289 |
var fondo = document.getElementById("fondo");
|
290 |
fondo.style.visibility = (fondo.style.visibility == "visible") ? "hidden" : "visible";
|
291 |
}
|
292 |
-
|
293 |
-
|
294 |
function updateOrder(action) {
|
295 |
var form = document.getElementById('Updateform_'+action);
|
296 |
var data = serialize(form);
|
@@ -301,34 +304,34 @@
|
|
301 |
var acciones = document.getElementById("acciones");
|
302 |
btnSubmit.innerHTML = "<img src='<?php echo $base_url."/beezup/omstatus/loader";?>' />";
|
303 |
ajax.get('<?php echo $base_url."beezup/omstatus/update?"?>'+data+"&adminUser=<?php echo $username;?>&order_id=<?php echo $order->getId();?>&uid=<?php echo $userid;?>&token=<?php echo $usertoken;?>&action_id="+action, {}, function(response) {
|
304 |
-
|
305 |
if (response.indexOf("SUCCESS") !=-1) {
|
306 |
alert.style.backgroundColor = "green";
|
307 |
-
|
308 |
} else {
|
309 |
alert.style.backgroundColor = "red";
|
310 |
-
|
311 |
-
|
312 |
}
|
313 |
-
|
314 |
alert.innerHTML = response;
|
315 |
alert.style.display="block";
|
316 |
btnSubmit.innerHTML = "";
|
317 |
fondo.style.visibility = (fondo.style.visibility == "visible") ? "hidden" : "visible";
|
318 |
el.style.visibility = (el.style.visibility == "visible") ? "hidden" : "visible";
|
319 |
acciones.innerHTML = "";
|
320 |
-
setTimeout(function () {
|
321 |
resync();
|
322 |
}, 2000);
|
323 |
});
|
324 |
-
|
325 |
-
|
326 |
console.log(data);
|
327 |
}
|
328 |
-
|
329 |
-
|
330 |
-
|
331 |
-
|
332 |
function serialize(form) {
|
333 |
var field, s = [];
|
334 |
if (typeof form == 'object' && form.nodeName == "FORM") {
|
@@ -350,6 +353,6 @@
|
|
350 |
return s.join('&').replace(/%20/g, '+');
|
351 |
}
|
352 |
</script>
|
353 |
-
|
354 |
-
<?php
|
355 |
-
} ?>
|
3 |
<h4><?php echo $this->__('BeezUP Info'); ?></h4>
|
4 |
</div>
|
5 |
<div class="fieldset fieldset-wide">
|
6 |
+
|
7 |
+
<?php
|
8 |
$order = $this->getOrder();
|
9 |
+
|
10 |
$shipment_collection = Mage::getResourceModel('sales/order_shipment_collection')
|
11 |
->setOrderFilter($order)
|
12 |
->load();
|
18 |
$shipping_data['tracking'] = $tracking_number->getNumber();
|
19 |
$shipping_data['carrier'] = $tracking_number->getTitle();
|
20 |
break;
|
21 |
+
}
|
22 |
break;
|
23 |
}
|
24 |
+
|
25 |
$blnBeezup = false;
|
26 |
$base_url = $url = Mage::getBaseUrl( Mage_Core_Model_Store::URL_TYPE_WEB, true );
|
27 |
+
|
28 |
$resource = Mage::getSingleton('core/resource');
|
29 |
$readConnection = $resource->getConnection('core_read');
|
30 |
$table = $resource->getTableName('sales/order_grid');
|
31 |
$query = 'SELECT * FROM ' . $table . ' WHERE beezup_order = 1 and entity_id = \''
|
32 |
+
. $order->getId() . '\' LIMIT 1';
|
33 |
$results = $readConnection->fetchAll($query);
|
34 |
//var_dump($results);
|
35 |
if($results[0]['beezup_order'] == 1) {
|
36 |
$blnBeezup = true;
|
37 |
+
|
38 |
$date = new DateTime($results[0]['beezup_marketplace_last_modification_date']);
|
39 |
$beezup_marketplace_last_modification_date = $date->format('d-m-Y H:i:s'). " (UTC Time)";
|
40 |
+
|
41 |
$date2 = new DateTime($results[0]['beezup_purchase_date']);
|
42 |
$beezup_purchase_date = $date2->format('d-m-Y H:i:s'). " (UTC Time)";
|
43 |
+
|
44 |
$date3 = new DateTime($results[0]['beezup_last_modification_date']);
|
45 |
$beezup_last_modification_date = $date3->format('d-m-Y H:i:s'). " (UTC Time)";
|
46 |
+
|
47 |
+
$results[0]['beezup_marketplace'] = str_replace("- FBA", "", $results[0]['beezup_marketplace']);
|
48 |
+
|
49 |
+
|
50 |
echo "<strong>".Mage::helper('beezup')->__('BeezUP Order Id:')." </strong> ".$results[0]['beezup_order_id']."<br>";
|
51 |
echo "<strong>".Mage::helper('beezup')->__('BeezUP Status:')." </strong> ".$results[0]['beezup_status']."<br>";
|
52 |
echo "<strong>".Mage::helper('beezup')->__('BeezUP Last Modification Date:')." </strong> ".$beezup_last_modification_date."<br>";
|
61 |
}
|
62 |
echo "<strong>".Mage::helper('beezup')->__('BeezUP Order Link:')." </strong> <a href='https://go.beezup.com/OrderManagement/Informations?BeezUPOrderUUId=".$results[0]['beezup_order_id']."&MarketplaceTechnicalCode=".$results[0]['beezup_marketplace']."&AccountId=".$results[0]['beezup_name']."' target='_blank'>https://go.beezup.com/OrderManagement/Informations?BeezUPOrderUUId=".$results[0]['beezup_order_id']."&MarketplaceTechnicalCode=".$results[0]['beezup_marketplace']."&AccountId=".$results[0]['beezup_name']."</a><br>";
|
63 |
} else {
|
64 |
+
|
65 |
echo Mage::helper('beezup')->__('No data here, since it\'s not an order coming from BeezUP');
|
66 |
}
|
67 |
+
|
68 |
?>
|
69 |
+
|
70 |
</div>
|
71 |
</div>
|
72 |
<?php if($blnBeezup) {
|
73 |
$firstname = Mage::getSingleton('admin/session')->getUser()->getFirstname();
|
74 |
$lastname = Mage::getSingleton('admin/session')->getUser()->getLastname();
|
75 |
$username = $firstname." ".$lastname;
|
76 |
+
|
77 |
$helper = Mage::helper('beezup');
|
78 |
$userid = $helper->getConfig('beezup/marketplace/userid');
|
79 |
$usertoken = $helper->getConfig('beezup/marketplace/usertoken');
|
80 |
$order_actions = $this->getBeezupInfo($order->getId());
|
81 |
?>
|
82 |
+
|
83 |
+
|
84 |
<style>
|
85 |
#acciones {
|
86 |
+
|
87 |
width: 80%;
|
88 |
float: left;
|
89 |
+
|
90 |
}
|
91 |
.calendar {
|
92 |
left: 40% !important;
|
93 |
position:fixed !Important;
|
94 |
top: 31% !Important;
|
95 |
z-index: 999999999 !Important;
|
96 |
+
|
97 |
}
|
98 |
.beezup-modal-dialog {
|
99 |
visibility:hidden;
|
101 |
left: 0px;
|
102 |
top: 20%;
|
103 |
width: 30%;
|
104 |
+
|
105 |
text-align: center;
|
106 |
z-index: 1000;
|
107 |
border: 2px solid gray;
|
138 |
top: 0;
|
139 |
left: 0;
|
140 |
z-index: 9999;
|
141 |
+
|
142 |
}
|
143 |
</style>
|
144 |
+
|
145 |
<div id="fondo"></div>
|
146 |
<div class="entry-edit">
|
147 |
<div class="entry-edit-head">
|
148 |
<h4><?php echo $this->__('BeezUP Order Status'); ?></h4>
|
149 |
+
</div>
|
150 |
<div class="fieldset fieldset-wide">
|
151 |
<div class="alert" id="msgAlert" style="display:none;padding: 10px;background-color: lightgrey; color:white;margin-bottom: 10px;"></div>
|
152 |
<div id="acciones">
|
153 |
+
<?php
|
154 |
if($order_actions['is_pending'] == false) {
|
155 |
+
foreach($order_actions as $key => $action) {
|
156 |
if(isset($action['action'])) {
|
157 |
$label = preg_replace('/(?<!\ )[A-Z]/', ' $0', $action['action']);
|
158 |
?>
|
159 |
+
|
160 |
<button class="button" style="background:gray;border-color:gray;" onclick="overlay('<?php echo $action['action'];?>');"><?php echo $label;?></button>
|
161 |
+
|
162 |
+
|
163 |
<div id="overlay_<?php echo $action['action'];?>" class="beezup-modal-dialog">
|
164 |
<div>
|
165 |
<span class="popup-close" onclick="overlay('<?php echo $action['action'];?>');">X</span>
|
170 |
<?php $inputs = $this->generateInput($action['parameters'], $shipping_data);
|
171 |
echo $inputs;
|
172 |
?>
|
173 |
+
|
174 |
</div>
|
175 |
<div id="submitBtn-<?php echo $action['action'];?>" style=" float: right;margin-right: 25px;"><button type="button" onclick="updateOrder('<?php echo $action['action'];?>');" class="button" name="submit" ><?php echo Mage::helper('beezup')->__('Update');?></button></div>
|
176 |
</form>
|
177 |
</div>
|
178 |
</div>
|
179 |
+
|
180 |
<?php }
|
181 |
} } else {?>
|
182 |
+
|
183 |
<div style="padding: 10px;background-color: lightgrey; margin-bottom: 10px;"><?php echo Mage::helper('beezup')->__('Order is syncronizing, please resync within a few mins to get updated info');?></div>
|
184 |
+
|
185 |
<?php } ?>
|
186 |
</div>
|
187 |
+
|
188 |
<button class="button" style="float:right;" onclick="resync();"><?php echo Mage::helper('beezup')->__('Resync Order');?></button>
|
189 |
<div id="ajax-loader" style="display:none;float:right;"><img src="<?php echo $base_url."/beezup/omstatus/loader";?>" /></div>
|
190 |
<br>
|
191 |
<div id="statusLoad" style="margin-top:15px;">
|
192 |
</div>
|
193 |
+
|
194 |
+
|
195 |
+
|
196 |
</div>
|
197 |
+
|
198 |
</div>
|
199 |
+
|
200 |
+
|
201 |
<script>
|
202 |
var ajax = {};
|
203 |
ajax.x = function() {
|
204 |
if (typeof XMLHttpRequest !== 'undefined') {
|
205 |
+
return new XMLHttpRequest();
|
206 |
}
|
207 |
var versions = [
|
208 |
"MSXML2.XmlHttp.6.0",
|
209 |
+
"MSXML2.XmlHttp.5.0",
|
210 |
+
"MSXML2.XmlHttp.4.0",
|
211 |
+
"MSXML2.XmlHttp.3.0",
|
212 |
+
"MSXML2.XmlHttp.2.0",
|
213 |
"Microsoft.XmlHttp"
|
214 |
];
|
215 |
+
|
216 |
var xhr;
|
217 |
+
for(var i = 0; i < versions.length; i++) {
|
218 |
+
try {
|
219 |
+
xhr = new ActiveXObject(versions[i]);
|
220 |
+
break;
|
221 |
} catch (e) {
|
222 |
+
}
|
223 |
}
|
224 |
return xhr;
|
225 |
};
|
226 |
+
|
227 |
ajax.send = function(url, callback, method, data, sync) {
|
228 |
var x = ajax.x();
|
229 |
x.open(method, url, sync);
|
237 |
}
|
238 |
x.send(data)
|
239 |
};
|
240 |
+
|
241 |
ajax.get = function(url, data, callback, sync) {
|
242 |
var query = [];
|
243 |
for (var key in data) {
|
245 |
}
|
246 |
ajax.send(url + (query.length ? '?' + query.join('&') : ''), callback, 'GET', null, sync)
|
247 |
};
|
248 |
+
|
249 |
ajax.post = function(url, data, callback, sync) {
|
250 |
var query = [];
|
251 |
for (var key in data) {
|
253 |
}
|
254 |
ajax.send(url, callback, 'POST', query.join('&'), sync)
|
255 |
};
|
256 |
+
|
257 |
+
|
258 |
+
|
259 |
function resync() {
|
260 |
document.getElementById("ajax-loader").style.display="block";
|
261 |
+
|
262 |
+
setTimeout(function () {
|
263 |
ajax.get('<?php echo $base_url."beezup/omstatus/resync";?>', {order_id : <?php echo $order->getId();?>, uid : '<?php echo $userid;?>', token : '<?php echo $usertoken;?>'}, function(response) {
|
264 |
document.getElementById("msgAlert").innerHTML = '';
|
265 |
document.getElementById("msgAlert").style.display = "block";
|
266 |
+
|
267 |
document.getElementById("ajax-loader").style.display="none";
|
268 |
if(response == 1) {
|
269 |
document.getElementById("msgAlert").innerHTML = '<?php echo Mage::helper('beezup')->__("Updated Order Ok page will refresh in 2 secc");?>';
|
270 |
document.getElementById("msgAlert").style.backgroundColor = "green";
|
271 |
+
|
272 |
setTimeout(function () { window.location='window.location.href'; } , 2000);
|
273 |
} else if(response == 2) {
|
274 |
document.getElementById("msgAlert").innerHTML = '<?php echo Mage::helper('beezup')->__('Order has been refreshed with no change');?>';
|
275 |
document.getElementById("msgAlert").style.backgroundColor = "orange";
|
276 |
+
|
277 |
} else {
|
278 |
document.getElementById("msgAlert").innerHTML = '<?php echo Mage::helper('beezup')->__("Order is syncronizing, please resync within a few mins to get updated info");?>';
|
279 |
document.getElementById("msgAlert").style.backgroundColor = "orange";
|
280 |
+
|
281 |
+
|
282 |
}
|
283 |
+
|
284 |
});
|
285 |
+
|
286 |
+
|
287 |
}, 1000);
|
288 |
}
|
289 |
function overlay(action) {
|
292 |
var fondo = document.getElementById("fondo");
|
293 |
fondo.style.visibility = (fondo.style.visibility == "visible") ? "hidden" : "visible";
|
294 |
}
|
295 |
+
|
296 |
+
|
297 |
function updateOrder(action) {
|
298 |
var form = document.getElementById('Updateform_'+action);
|
299 |
var data = serialize(form);
|
304 |
var acciones = document.getElementById("acciones");
|
305 |
btnSubmit.innerHTML = "<img src='<?php echo $base_url."/beezup/omstatus/loader";?>' />";
|
306 |
ajax.get('<?php echo $base_url."beezup/omstatus/update?"?>'+data+"&adminUser=<?php echo $username;?>&order_id=<?php echo $order->getId();?>&uid=<?php echo $userid;?>&token=<?php echo $usertoken;?>&action_id="+action, {}, function(response) {
|
307 |
+
|
308 |
if (response.indexOf("SUCCESS") !=-1) {
|
309 |
alert.style.backgroundColor = "green";
|
310 |
+
|
311 |
} else {
|
312 |
alert.style.backgroundColor = "red";
|
313 |
+
|
314 |
+
|
315 |
}
|
316 |
+
|
317 |
alert.innerHTML = response;
|
318 |
alert.style.display="block";
|
319 |
btnSubmit.innerHTML = "";
|
320 |
fondo.style.visibility = (fondo.style.visibility == "visible") ? "hidden" : "visible";
|
321 |
el.style.visibility = (el.style.visibility == "visible") ? "hidden" : "visible";
|
322 |
acciones.innerHTML = "";
|
323 |
+
setTimeout(function () {
|
324 |
resync();
|
325 |
}, 2000);
|
326 |
});
|
327 |
+
|
328 |
+
|
329 |
console.log(data);
|
330 |
}
|
331 |
+
|
332 |
+
|
333 |
+
|
334 |
+
|
335 |
function serialize(form) {
|
336 |
var field, s = [];
|
337 |
if (typeof form == 'object' && form.nodeName == "FORM") {
|
353 |
return s.join('&').replace(/%20/g, '+');
|
354 |
}
|
355 |
</script>
|
356 |
+
|
357 |
+
<?php
|
358 |
+
} ?>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>BeezUP_Module_feed_and_tracker</name>
|
4 |
-
<version>4.7.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License</license>
|
7 |
<channel>community</channel>
|
@@ -42,11 +42,11 @@ After Set-up, the following files are added :</p>
|
|
42 |

|
43 |
<p>By BeezUP & Magentix</p></description>
|
44 |
<notes>New features :
|
45 |
-
-
|
46 |
<authors><author><name>BeezUP</name><user>BeezUP</user><email>charles@beezup.com</email></author></authors>
|
47 |
-
<date>2017-
|
48 |
-
<time>
|
49 |
-
<contents><target name="magecommunity"><dir name="BeezUp"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="e18c65bc83cab8795b4ffd0d46e04c8a"/><dir name="Invoice"><file name="Totals.php" hash="ac065cd586fd2534de7e12762ab9b335"/></dir><file name="Totals.php" hash="5972281aa467d63da56a297a8df3da55"/><dir name="View"><dir name="Tab"><file name="Custom.php" hash="a60f500d604038645b826fa74e9b6619"/></dir></dir></dir><file name="Order.php" hash="c038c302f2c86f79431b49c7282c3f5c"/></dir><dir name="System"><dir name="Config"><file name="Attributes.php" hash="a504265fe4dc2df69b311d8219c88fbf"/><file name="Autoship.php" hash="f924df1d1ee8dff3440c43625771e2d6"/><file name="Button.php" hash="476b33034b0c7d36e1bbd85f38b841db"/><file name="Childgroup.php" hash="388d3dee8f9d66a56c43c2790a44b45a"/><file name="Credentials.php" hash="b86f361800bebfd6fcf3564d9fe87c95"/><file name="Cron.php" hash="e1d47b095623593beb7f166d2ad7fecc"/><file name="Filter.php" hash="ad7ba55e18c080e25a08309dc428402a"/><file name="Log.php" hash="86221765980c0aee2381d5efd740949d"/><file name="Manualcron.php" hash="cbac01f15d256a43f0388f58449bffd0"/><file name="Orderlink.php" hash="afc8a4926b2769b15beb5b72ae94b696"/><file name="Stores.php" hash="4297f4c94f136bb9778c9ddcd0cb336c"/><file name="Syncstatus.php" hash="49164eb19331aadabc0581472cd3c567"/><file name="Time.php" hash="ac5c2e4a40e9c6ff68cea1097dfa1e7b"/></dir></dir></dir><file name="Omstatus.php" hash="061d861d973e232a18acea0387a4a290"/><file name="Order.php" hash="5877cfe77a4f91eaaaee93005c4d2446"/><file name="Tracking.php" hash="e6dcd6b89e782b2eb6cb83abfb1b7f56"/><file name="Xml.php" hash="dbaed2a7dfb2ea57f932865a09ae9760"/></dir><dir name="Helper"><file name="Data.php" hash="867a2562b255beaf3faa047d4130304f"/></dir><dir name="Model"><file name="Carrier.php" hash="4a8f63e7cab3145ab679fbe0eff9a0bd"/><file name="Flatrate.php" hash="27d078203781d9b923605f685bfe5c25"/><file name="Observer.php" hash="d1af2bad4ecf48d3615862182b074dea"/><file name="Products.php" hash="e2ffaec55b84d4c1923547fc2aad47b6"/><dir name="Quote"><file name="Item.php" hash="13cef88e165932990fa032b57e8905a0"/></dir><dir name="Sales"><dir name="Order"><dir name="Pdf"><file name="Invoice.php" hash="9eaf28084db176b41c6007da3d529d18"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Attributes.php" hash="174aee475c6a6a8b0b4f2e8e076c6a25"/><file name="Autoship.php" hash="7a3b906a58f488b35872d164dff9f336"/><file name="Credentials.php" hash="09ef9fab57f64eb6415d71ba8aec2412"/><file name="Marketchannel.php" hash="61c795231e6ada05d287fe376ef1ae49"/><file name="Time.php" hash="a70e4d748a9b300ec7b718168fa4d5f8"/><file name="Token.php" hash="60247c8b4d5889433ae1f92e998cc889"/></dir><dir name="Source"><file name="Attributes.php" hash="8f57313a41349c7a8132b8d8e2de275e"/><file name="Autoshipcarriers.php" hash="8d630c9bff8db63b4fb30f11768ce443"/><file name="Availableproducts.php" hash="d9d4b3705f5fbd98efbae0289a1b6d6d"/><file name="Cache.php" hash="0ca6ccc2fed56e2c602d76880d062053"/><file name="Carriers.php" hash="2aa4edae4a91dfd0bbb752aa2f4c0073"/><file name="Categories.php" hash="c4e9f0a54f1d9c688543f26f02f99142"/><file name="Countries.php" hash="b6f1a9a75d5368d6365f06b42524e002"/><file name="Customercreate.php" hash="ca5d2b2d1ad4e18f9a1135af21b10bc2"/><file name="Debug.php" hash="6538ebc0cd0d61c124e5adc806e71aff"/><file name="Description.php" hash="1746e688692fc99524f02fb18e707dcf"/><file name="Images.php" hash="78fb5e2054bbfaa2e76263b1aa9197cc"/><file name="Marketchannel.php" hash="30f98cb077a4ec9cb3b7206f2ac21417"/><file name="Montant.php" hash="3a46b8d564f1c2f0ed3b62354ac8964f"/><file name="Payment.php" hash="4bebe8e6ab0f980c1ada872b46e86503"/><file name="Position.php" hash="f1d6f89f5db5bfeedc506c539e76e3a8"/><file name="Price.php" hash="71707a69106cdd4990767351ab78fc04"/><file name="Shipping.php" hash="93401afc4fe0fb60824b778a26a24cdd"/><file name="Status.php" hash="d32004ad97adac6de361703a403a6a97"/><file name="Userid.php" hash="3d028bc3bfcaf7541b57676c014c94db"/><file name="Visibility.php" hash="91c69e8f967c13162eb38306c0391080"/></dir></dir></dir></dir><dir name="controllers"><file name="CacheController.php" hash="512cc26abd39d556104d5e69c0ac8a0d"/><file name="CatalogController.php" hash="0b65f6951e26283ea8c60bffa397186d"/><file name="CronController.php" hash="026ddcd6df9a51a41037687ca8d53a0b"/><file name="LogController.php" hash="5eff0d0a2c5621456e580e214d05c745"/><file name="OmstatusController.php" hash="95ae171ef21f861a7eaf74931b62a9db"/><file name="OrderController.php" hash="a2b8df2fb01fb4df8e7f04bcd7689bb3"/></dir><dir name="etc"><file name="adminhtml.xml" hash="e50ed10cb5025ff3a6dd7c90a6f7e0a4"/><file name="config.xml" hash="b70eb422eafc4a12e0997ccdce5eb2dd"/><file name="system.xml" hash="624bfba117cc504f470b7c4afff3e9c9"/></dir><dir name="img"><file name="ajax-loader.gif" hash="2a6692973429d7a74513bfa8bcb5be20"/></dir><dir name="lib"><file name="BeezupMageOrders.php" hash="6b690ddfb6ad93d98cf734925aef7121"/><file name="BeezupOMDataHandler.php" hash="cf738987179f3125fc0f4626fd70f1a0"/><file name="BeezupOMOrderService.php" hash="47c09c14dce66f914023ff09374cd674"/><file name="BeezupOMOrderServiceInterface.php" hash="9b18485ae224c32f46ae5a2ec5966e5b"/><file name="BeezupOMRepositoryInterface.php" hash="c2a8267c01c3e5def25ed41f715fa4b4"/><file name="BeezupOMRequestData.php" hash="162196502ecc6078ac6b7dec6f068c80"/><file name="BeezupOMResponseData.php" hash="955ce5316129e837190f2ccf9962d74f"/><file name="BeezupOMServiceClientProxy.php" hash="5e3a1759aabfb0349f270ce4cfd80725"/><file name="BeezupOMStatus.php" hash="54c45bb77f16a81d20b5a998eaab377b"/><file name="BeezupRepository.php" hash="4a4eaabcd0a5d7427154e93757c3733d"/><dir name="Common"><file name="BeezupOMCredential.php" hash="7f45272d16860058af07005dda39672e"/><file name="BeezupOMErrorSummary.php" hash="418db7b85beb030b2d28aee6c8b35bf1"/><file name="BeezupOMExpectedOrderChangeMetaInfo.php" hash="be802f69a3474d6cc6a5899711c7018c"/><file name="BeezupOMInfoSummaries.php" hash="cdece780cf38e3f09ce2d5550b93a567"/><file name="BeezupOMInfoSummary.php" hash="3b0d49f22882e239c87060aa58beb643"/><file name="BeezupOMLink.php" hash="9fa99dce0b51e235e101259b2f0304f8"/><file name="BeezupOMOrderIdentifier.php" hash="334f410bf0794cb2ce02b4b1e6d3e0f4"/><file name="BeezupOMProcessingStatus.php" hash="b70c4c23a75360b5bee4d9ddec9e7915"/><file name="BeezupOMRequest.php" hash="2497b1ed30c12d179a5629479aee418d"/><file name="BeezupOMResponse.php" hash="690688115873ac9a3172bf67a0d62b50"/><file name="BeezupOMResult.php" hash="5cb890ce4ad4205114dd94cd1f28222d"/><file name="BeezupOMSuccessSummary.php" hash="791c6c186ed15ec1b872905b820cd03c"/><file name="BeezupOMSummary.php" hash="6cc3712480eff9f19b80b0ab887155f0"/><file name="BeezupOMWarningSummary.php" hash="03cfd6a98901b6b460b974b8e938a659"/></dir><dir name="Harvest"><file name="BeezupOMHarvestAbstractReporting.php" hash="3d499a69ea7b646eaeef5b80f0a919f3"/><file name="BeezupOMHarvestClientReporting.php" hash="1e40eca349352912e408718f3b218777"/><file name="BeezupOMHarvestOrderReporting.php" hash="778ba93a7673f35b2072003e3510ba6b"/></dir><file name="KLogger.php" hash="fe1d31bbfdf4d59a858ffd43453536c2"/><dir name="LOV"><file name="BeezupOMLOVRequest.php" hash="165c873b3fea4201a3b35596d24ffe36"/><file name="BeezupOMLOVResponse.php" hash="586749fb17b16d5ff9f07909e516b3c7"/><file name="BeezupOMLOVResult.php" hash="c0e3cc917a1d625ac6094917481a7b52"/><file name="BeezupOMLOVValue.php" hash="0dd13ae88e99c2537df8804f3af248b9"/></dir><dir name="Marketplaces"><file name="BeezupOMMarketplace.php" hash="b85f1c977258ebc70c206a4ff461cb9a"/><file name="BeezupOMMarketplacesRequest.php" hash="5d1b27434872ed04210b9af795f5e464"/><file name="BeezupOMMarketplacesResponse.php" hash="0837f9ba0a610492362d73cd54ed4123"/><file name="BeezupOMMarketplacesResult.php" hash="369a2bf6e4c4134636ddeb849c6a8945"/></dir><dir name="Order"><file name="BeezupOMOrderItem.php" hash="a770b90ae4fcb6535563be6ff59f7528"/><file name="BeezupOMOrderRequest.php" hash="9afa0f18fc0aef344c3f71d054db23a0"/><file name="BeezupOMOrderResponse.php" hash="e8793a8754ec75a92ca6266357462307"/><file name="BeezupOMOrderResult.php" hash="2459b50c8287476e3f8750929d6596a8"/></dir><dir name="OrderChange"><file name="BeezupOMOrderChangeMetaInfo.php" hash="abdbdfd6c3bf291fd38f9b3ddc419405"/><file name="BeezupOMOrderChangeRequest.php" hash="f43b9c0a052fe5346a1b309c6d96ae9c"/><file name="BeezupOMOrderChangeResponse.php" hash="bbb4e49e5ddb90991e763daa439a5642"/><file name="BeezupOMOrderChangeResult.php" hash="e7314addf6c2e51196577055d583f350"/></dir><dir name="OrderHistory"><file name="BeezupOMOrderChangeReporting.php" hash="fc7a7d7ee8bc53f8c5b7ed19793a911a"/><file name="BeezupOMOrderHarvestReporting.php" hash="e4cb500ef347d8e8543e0bf278d3d77c"/><file name="BeezupOMOrderHistoryRequest.php" hash="2e39c26d8d9dd4d5a92a2cde06c41353"/><file name="BeezupOMOrderHistoryResponse.php" hash="dc6a0c6dc89bf1f376d1ecfebd052a4b"/><file name="BeezupOMOrderHistoryResult.php" hash="d85d9b4ecf6c0456b5c8453cc3b9cfdd"/></dir><dir name="OrderList"><file name="BeezupOMOrderHeader.php" hash="af366bc39855f1315678f01b53859c1c"/><file name="BeezupOMOrderListRequest.php" hash="817c20c7c82fd5f05e0efb19ee19ec4b"/><file name="BeezupOMOrderListResponse.php" hash="b1b0ed33ba495f6e2c2f3a39ade2a5cd"/><file name="BeezupOMOrderListResult.php" hash="8befe82305a6c6fe3cacf113b3722585"/><file name="BeezupOMPaginationResult.php" hash="1e1ef534ddef8ac43d98839b4ed7f941"/></dir><dir name="SetOrderId"><file name="BeezupOMSetOrderIdRequest.php" hash="40b4a05023396115f582c2e907834e3b"/><file name="BeezupOMSetOrderIdResponse.php" hash="c4cb1f9013ae32dfdff8ca80e4725282"/><file name="BeezupOMSetOrderIdResult.php" hash="8b35abb55c52f6acdfd55bf20b370bf0"/><file name="BeezupOMSetOrderIdValues.php" hash="978b41465512c15bfe160463ca23d24f"/></dir><dir name="Stores"><file name="BeezupOMStore.php" hash="0882efcae2eff339d6cdcceee83135a7"/><file name="BeezupOMStoresRequest.php" hash="a6b1391e306f2ed21fd5e2fcdbcbbec5"/><file name="BeezupOMStoresResponse.php" hash="21535a8957506ef7da343a0526b57b02"/><file name="BeezupOMStoresResult.php" hash="d4ceed947e9e8086638497e75bbd20e8"/></dir><file name="bootstrap.php" hash="9dba513402094fc02ec291e08583b419"/><file name="debug.txt" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="sql"><dir name="beezup_setup"><file name="mysql4-install-4.0.0.php" hash="75dacb26e3f96975a873c906eb37fbb0"/><file name="mysql4-upgrade-4.5.0-4.6.0.php" hash="34d1bc3a9b7658923a389fd6653ed4c9"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="BeezUp.xml" hash="78c53bf08b7a60920283c91fec9f18dd"/></dir></target><target name="magelocale"><dir name="fr_FR"><file name="BeezUp.csv" hash="1f04383e5ef8b750a56a860b003aaa8d"/></dir><dir name="en_US"><file name="BeezUp.csv" hash="05b26592c14245824173936807731db4"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="beezup_salestab.xml" hash="784925d72538a1eeb0ca695417147a7a"/></dir><dir name="template"><dir name="beezup"><file name="custom.phtml" hash="ea83d17a2e8814c3a9ae9e056c7926a8"/></dir></dir></dir></dir></dir></target></contents>
|
50 |
<compatible/>
|
51 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
52 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>BeezUP_Module_feed_and_tracker</name>
|
4 |
+
<version>4.7.6</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License</license>
|
7 |
<channel>community</channel>
|
42 |

|
43 |
<p>By BeezUP & Magentix</p></description>
|
44 |
<notes>New features :
|
45 |
+
- Improved Category 1 logic</notes>
|
46 |
<authors><author><name>BeezUP</name><user>BeezUP</user><email>charles@beezup.com</email></author></authors>
|
47 |
+
<date>2017-06-15</date>
|
48 |
+
<time>12:01:38</time>
|
49 |
+
<contents><target name="magecommunity"><dir name="BeezUp"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="e18c65bc83cab8795b4ffd0d46e04c8a"/><dir name="Invoice"><file name="Totals.php" hash="ac065cd586fd2534de7e12762ab9b335"/></dir><file name="Totals.php" hash="5972281aa467d63da56a297a8df3da55"/><dir name="View"><dir name="Tab"><file name="Custom.php" hash="a60f500d604038645b826fa74e9b6619"/></dir></dir></dir><file name="Order.php" hash="c038c302f2c86f79431b49c7282c3f5c"/></dir><dir name="System"><dir name="Config"><file name="Attributes.php" hash="a504265fe4dc2df69b311d8219c88fbf"/><file name="Autoship.php" hash="f924df1d1ee8dff3440c43625771e2d6"/><file name="Button.php" hash="476b33034b0c7d36e1bbd85f38b841db"/><file name="Childgroup.php" hash="388d3dee8f9d66a56c43c2790a44b45a"/><file name="Credentials.php" hash="b86f361800bebfd6fcf3564d9fe87c95"/><file name="Cron.php" hash="e1d47b095623593beb7f166d2ad7fecc"/><file name="Filter.php" hash="ad7ba55e18c080e25a08309dc428402a"/><file name="Log.php" hash="86221765980c0aee2381d5efd740949d"/><file name="Manualcron.php" hash="cbac01f15d256a43f0388f58449bffd0"/><file name="Orderlink.php" hash="afc8a4926b2769b15beb5b72ae94b696"/><file name="Stores.php" hash="4297f4c94f136bb9778c9ddcd0cb336c"/><file name="Syncstatus.php" hash="49164eb19331aadabc0581472cd3c567"/><file name="Time.php" hash="ac5c2e4a40e9c6ff68cea1097dfa1e7b"/></dir></dir></dir><file name="Omstatus.php" hash="061d861d973e232a18acea0387a4a290"/><file name="Order.php" hash="46783d9f99912bab5f90b3cb36854f84"/><file name="Tracking.php" hash="e6dcd6b89e782b2eb6cb83abfb1b7f56"/><file name="Xml.php" hash="c6a317da3f650f3f6c628ca74f1b6c78"/></dir><dir name="Helper"><file name="Data.php" hash="867a2562b255beaf3faa047d4130304f"/></dir><dir name="Model"><file name="Carrier.php" hash="4a8f63e7cab3145ab679fbe0eff9a0bd"/><file name="Flatrate.php" hash="27d078203781d9b923605f685bfe5c25"/><file name="Observer.php" hash="d1af2bad4ecf48d3615862182b074dea"/><file name="Products.php" hash="77c97ca91b750721ba75b6211eb6506b"/><dir name="Quote"><file name="Item.php" hash="13cef88e165932990fa032b57e8905a0"/></dir><dir name="Sales"><dir name="Order"><dir name="Pdf"><file name="Invoice.php" hash="9eaf28084db176b41c6007da3d529d18"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Attributes.php" hash="174aee475c6a6a8b0b4f2e8e076c6a25"/><file name="Autoship.php" hash="7a3b906a58f488b35872d164dff9f336"/><file name="Credentials.php" hash="09ef9fab57f64eb6415d71ba8aec2412"/><file name="Marketchannel.php" hash="61c795231e6ada05d287fe376ef1ae49"/><file name="Time.php" hash="a70e4d748a9b300ec7b718168fa4d5f8"/><file name="Token.php" hash="60247c8b4d5889433ae1f92e998cc889"/></dir><dir name="Source"><file name="Attributes.php" hash="8f57313a41349c7a8132b8d8e2de275e"/><file name="Autoshipcarriers.php" hash="8d630c9bff8db63b4fb30f11768ce443"/><file name="Availableproducts.php" hash="d9d4b3705f5fbd98efbae0289a1b6d6d"/><file name="Cache.php" hash="0ca6ccc2fed56e2c602d76880d062053"/><file name="Carriers.php" hash="2aa4edae4a91dfd0bbb752aa2f4c0073"/><file name="Categories.php" hash="c4e9f0a54f1d9c688543f26f02f99142"/><file name="Countries.php" hash="b6f1a9a75d5368d6365f06b42524e002"/><file name="Customercreate.php" hash="ca5d2b2d1ad4e18f9a1135af21b10bc2"/><file name="Debug.php" hash="6538ebc0cd0d61c124e5adc806e71aff"/><file name="Description.php" hash="1746e688692fc99524f02fb18e707dcf"/><file name="Images.php" hash="78fb5e2054bbfaa2e76263b1aa9197cc"/><file name="Marketchannel.php" hash="30f98cb077a4ec9cb3b7206f2ac21417"/><file name="Montant.php" hash="3a46b8d564f1c2f0ed3b62354ac8964f"/><file name="Payment.php" hash="4bebe8e6ab0f980c1ada872b46e86503"/><file name="Position.php" hash="f1d6f89f5db5bfeedc506c539e76e3a8"/><file name="Price.php" hash="71707a69106cdd4990767351ab78fc04"/><file name="Shipping.php" hash="93401afc4fe0fb60824b778a26a24cdd"/><file name="Status.php" hash="d32004ad97adac6de361703a403a6a97"/><file name="Userid.php" hash="3d028bc3bfcaf7541b57676c014c94db"/><file name="Visibility.php" hash="91c69e8f967c13162eb38306c0391080"/></dir></dir></dir></dir><dir name="controllers"><file name="CacheController.php" hash="512cc26abd39d556104d5e69c0ac8a0d"/><file name="CatalogController.php" hash="0b65f6951e26283ea8c60bffa397186d"/><file name="CronController.php" hash="026ddcd6df9a51a41037687ca8d53a0b"/><file name="LogController.php" hash="5eff0d0a2c5621456e580e214d05c745"/><file name="OmstatusController.php" hash="95ae171ef21f861a7eaf74931b62a9db"/><file name="OrderController.php" hash="a2b8df2fb01fb4df8e7f04bcd7689bb3"/></dir><dir name="etc"><file name="adminhtml.xml" hash="e50ed10cb5025ff3a6dd7c90a6f7e0a4"/><file name="config.xml" hash="25a120b192dcaa004d97c00136ef1990"/><file name="system.xml" hash="a21b1f39bd56bc07c9e45621d03cd6bd"/></dir><dir name="img"><file name="ajax-loader.gif" hash="2a6692973429d7a74513bfa8bcb5be20"/></dir><dir name="lib"><file name="BeezupMageOrders.php" hash="6b690ddfb6ad93d98cf734925aef7121"/><file name="BeezupOMDataHandler.php" hash="cf738987179f3125fc0f4626fd70f1a0"/><file name="BeezupOMOrderService.php" hash="47c09c14dce66f914023ff09374cd674"/><file name="BeezupOMOrderServiceInterface.php" hash="9b18485ae224c32f46ae5a2ec5966e5b"/><file name="BeezupOMRepositoryInterface.php" hash="c2a8267c01c3e5def25ed41f715fa4b4"/><file name="BeezupOMRequestData.php" hash="162196502ecc6078ac6b7dec6f068c80"/><file name="BeezupOMResponseData.php" hash="955ce5316129e837190f2ccf9962d74f"/><file name="BeezupOMServiceClientProxy.php" hash="5e3a1759aabfb0349f270ce4cfd80725"/><file name="BeezupOMStatus.php" hash="54c45bb77f16a81d20b5a998eaab377b"/><file name="BeezupRepository.php" hash="4a4eaabcd0a5d7427154e93757c3733d"/><dir name="Common"><file name="BeezupOMCredential.php" hash="7f45272d16860058af07005dda39672e"/><file name="BeezupOMErrorSummary.php" hash="418db7b85beb030b2d28aee6c8b35bf1"/><file name="BeezupOMExpectedOrderChangeMetaInfo.php" hash="be802f69a3474d6cc6a5899711c7018c"/><file name="BeezupOMInfoSummaries.php" hash="cdece780cf38e3f09ce2d5550b93a567"/><file name="BeezupOMInfoSummary.php" hash="3b0d49f22882e239c87060aa58beb643"/><file name="BeezupOMLink.php" hash="9fa99dce0b51e235e101259b2f0304f8"/><file name="BeezupOMOrderIdentifier.php" hash="334f410bf0794cb2ce02b4b1e6d3e0f4"/><file name="BeezupOMProcessingStatus.php" hash="b70c4c23a75360b5bee4d9ddec9e7915"/><file name="BeezupOMRequest.php" hash="2497b1ed30c12d179a5629479aee418d"/><file name="BeezupOMResponse.php" hash="690688115873ac9a3172bf67a0d62b50"/><file name="BeezupOMResult.php" hash="5cb890ce4ad4205114dd94cd1f28222d"/><file name="BeezupOMSuccessSummary.php" hash="791c6c186ed15ec1b872905b820cd03c"/><file name="BeezupOMSummary.php" hash="6cc3712480eff9f19b80b0ab887155f0"/><file name="BeezupOMWarningSummary.php" hash="03cfd6a98901b6b460b974b8e938a659"/></dir><dir name="Harvest"><file name="BeezupOMHarvestAbstractReporting.php" hash="3d499a69ea7b646eaeef5b80f0a919f3"/><file name="BeezupOMHarvestClientReporting.php" hash="1e40eca349352912e408718f3b218777"/><file name="BeezupOMHarvestOrderReporting.php" hash="778ba93a7673f35b2072003e3510ba6b"/></dir><file name="KLogger.php" hash="fe1d31bbfdf4d59a858ffd43453536c2"/><dir name="LOV"><file name="BeezupOMLOVRequest.php" hash="165c873b3fea4201a3b35596d24ffe36"/><file name="BeezupOMLOVResponse.php" hash="586749fb17b16d5ff9f07909e516b3c7"/><file name="BeezupOMLOVResult.php" hash="c0e3cc917a1d625ac6094917481a7b52"/><file name="BeezupOMLOVValue.php" hash="0dd13ae88e99c2537df8804f3af248b9"/></dir><dir name="Marketplaces"><file name="BeezupOMMarketplace.php" hash="b85f1c977258ebc70c206a4ff461cb9a"/><file name="BeezupOMMarketplacesRequest.php" hash="5d1b27434872ed04210b9af795f5e464"/><file name="BeezupOMMarketplacesResponse.php" hash="0837f9ba0a610492362d73cd54ed4123"/><file name="BeezupOMMarketplacesResult.php" hash="369a2bf6e4c4134636ddeb849c6a8945"/></dir><dir name="Order"><file name="BeezupOMOrderItem.php" hash="a770b90ae4fcb6535563be6ff59f7528"/><file name="BeezupOMOrderRequest.php" hash="9afa0f18fc0aef344c3f71d054db23a0"/><file name="BeezupOMOrderResponse.php" hash="e8793a8754ec75a92ca6266357462307"/><file name="BeezupOMOrderResult.php" hash="2459b50c8287476e3f8750929d6596a8"/></dir><dir name="OrderChange"><file name="BeezupOMOrderChangeMetaInfo.php" hash="abdbdfd6c3bf291fd38f9b3ddc419405"/><file name="BeezupOMOrderChangeRequest.php" hash="f43b9c0a052fe5346a1b309c6d96ae9c"/><file name="BeezupOMOrderChangeResponse.php" hash="bbb4e49e5ddb90991e763daa439a5642"/><file name="BeezupOMOrderChangeResult.php" hash="e7314addf6c2e51196577055d583f350"/></dir><dir name="OrderHistory"><file name="BeezupOMOrderChangeReporting.php" hash="fc7a7d7ee8bc53f8c5b7ed19793a911a"/><file name="BeezupOMOrderHarvestReporting.php" hash="e4cb500ef347d8e8543e0bf278d3d77c"/><file name="BeezupOMOrderHistoryRequest.php" hash="2e39c26d8d9dd4d5a92a2cde06c41353"/><file name="BeezupOMOrderHistoryResponse.php" hash="dc6a0c6dc89bf1f376d1ecfebd052a4b"/><file name="BeezupOMOrderHistoryResult.php" hash="d85d9b4ecf6c0456b5c8453cc3b9cfdd"/></dir><dir name="OrderList"><file name="BeezupOMOrderHeader.php" hash="af366bc39855f1315678f01b53859c1c"/><file name="BeezupOMOrderListRequest.php" hash="817c20c7c82fd5f05e0efb19ee19ec4b"/><file name="BeezupOMOrderListResponse.php" hash="b1b0ed33ba495f6e2c2f3a39ade2a5cd"/><file name="BeezupOMOrderListResult.php" hash="8befe82305a6c6fe3cacf113b3722585"/><file name="BeezupOMPaginationResult.php" hash="1e1ef534ddef8ac43d98839b4ed7f941"/></dir><dir name="SetOrderId"><file name="BeezupOMSetOrderIdRequest.php" hash="40b4a05023396115f582c2e907834e3b"/><file name="BeezupOMSetOrderIdResponse.php" hash="c4cb1f9013ae32dfdff8ca80e4725282"/><file name="BeezupOMSetOrderIdResult.php" hash="8b35abb55c52f6acdfd55bf20b370bf0"/><file name="BeezupOMSetOrderIdValues.php" hash="978b41465512c15bfe160463ca23d24f"/></dir><dir name="Stores"><file name="BeezupOMStore.php" hash="0882efcae2eff339d6cdcceee83135a7"/><file name="BeezupOMStoresRequest.php" hash="a6b1391e306f2ed21fd5e2fcdbcbbec5"/><file name="BeezupOMStoresResponse.php" hash="21535a8957506ef7da343a0526b57b02"/><file name="BeezupOMStoresResult.php" hash="d4ceed947e9e8086638497e75bbd20e8"/></dir><file name="bootstrap.php" hash="9dba513402094fc02ec291e08583b419"/><file name="debug.txt" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="sql"><dir name="beezup_setup"><file name="mysql4-install-4.0.0.php" hash="75dacb26e3f96975a873c906eb37fbb0"/><file name="mysql4-upgrade-4.5.0-4.6.0.php" hash="34d1bc3a9b7658923a389fd6653ed4c9"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="BeezUp.xml" hash="78c53bf08b7a60920283c91fec9f18dd"/></dir></target><target name="magelocale"><dir name="fr_FR"><file name="BeezUp.csv" hash="1f04383e5ef8b750a56a860b003aaa8d"/></dir><dir name="en_US"><file name="BeezUp.csv" hash="05b26592c14245824173936807731db4"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="beezup_salestab.xml" hash="784925d72538a1eeb0ca695417147a7a"/></dir><dir name="template"><dir name="beezup"><file name="custom.phtml" hash="d0555709ad0a85a8f210ba268193e711"/></dir></dir></dir></dir></dir></target></contents>
|
50 |
<compatible/>
|
51 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
52 |
</package>
|