Version Notes
- Minor bugfixes & improvements
Download this release
Release Info
| Developer | ShoppingFlux |
| Extension | Profileolabs_Shoppingflux |
| Version | 0.7.2 |
| Comparing to | |
| See all releases | |
Code changes from version 0.7.1 to 0.7.2
- app/code/community/Profileolabs/Shoppingflux/Block/Export/Adminhtml/Feed.php +27 -0
- app/code/community/Profileolabs/Shoppingflux/Block/Export/Adminhtml/Product/Grid.php +31 -0
- app/code/community/Profileolabs/Shoppingflux/Model/Export/Flux.php +2 -2
- app/code/community/Profileolabs/Shoppingflux/Model/Export/Source/Attributes.php +14 -9
- app/code/community/Profileolabs/Shoppingflux/controllers/Export/Adminhtml/ExportController.php +8 -0
- app/code/community/Profileolabs/Shoppingflux/etc/adminhtml.xml +111 -0
- app/code/community/Profileolabs/Shoppingflux/etc/config.xml +1 -114
- app/design/adminhtml/default/default/layout/profileolabs_shoppingflux.xml +5 -13
- app/design/adminhtml/default/default/template/profileolabs/shoppingflux/export/feed.phtml +22 -0
- package.xml +4 -4
app/code/community/Profileolabs/Shoppingflux/Block/Export/Adminhtml/Feed.php
ADDED
|
@@ -0,0 +1,27 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Shoppingflux select products block
|
| 4 |
+
*
|
| 5 |
+
* @category Profileolabs
|
| 6 |
+
* @package Profileolabs_Shoppingflux
|
| 7 |
+
* @author kassim belghait kassim@profileo.com
|
| 8 |
+
*/
|
| 9 |
+
class Profileolabs_Shoppingflux_Block_Export_Adminhtml_Feed extends Mage_Adminhtml_Block_Widget_Container
|
| 10 |
+
{
|
| 11 |
+
/**
|
| 12 |
+
* Set template
|
| 13 |
+
*/
|
| 14 |
+
public function __construct()
|
| 15 |
+
{
|
| 16 |
+
parent::__construct();
|
| 17 |
+
$this->setTemplate('profileolabs/shoppingflux/export/feed.phtml');
|
| 18 |
+
}
|
| 19 |
+
|
| 20 |
+
public function getFeedUrl($store) {
|
| 21 |
+
return preg_replace('%^(.*)\?.*$%i', '$1', $store->getUrl('shoppingflux/export_flux/index'));
|
| 22 |
+
}
|
| 23 |
+
|
| 24 |
+
public function storeHasFeed($store) {
|
| 25 |
+
return Mage::getSingleton('profileolabs_shoppingflux/config')->isExportEnabled($store->getId());
|
| 26 |
+
}
|
| 27 |
+
}
|
app/code/community/Profileolabs/Shoppingflux/Block/Export/Adminhtml/Product/Grid.php
CHANGED
|
@@ -57,13 +57,26 @@ class Profileolabs_Shoppingflux_Block_Export_Adminhtml_Product_Grid extends Mage
|
|
| 57 |
$collection->addAttributeToSelect('status');
|
| 58 |
$collection->addAttributeToSelect('visibility');
|
| 59 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
| 60 |
|
|
|
|
|
|
|
| 61 |
$this->setCollection($collection);
|
| 62 |
|
| 63 |
parent::_prepareCollection();
|
| 64 |
$this->getCollection()->addWebsiteNamesToResult();
|
| 65 |
return $this;
|
| 66 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 67 |
|
| 68 |
protected function _addColumnFilterToCollection($column)
|
| 69 |
{
|
|
@@ -104,6 +117,16 @@ class Profileolabs_Shoppingflux_Block_Export_Adminhtml_Product_Grid extends Mage
|
|
| 104 |
));
|
| 105 |
}
|
| 106 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 107 |
$this->addColumn('type',
|
| 108 |
array(
|
| 109 |
'header'=> Mage::helper('catalog')->__('Type'),
|
|
@@ -225,4 +248,12 @@ class Profileolabs_Shoppingflux_Block_Export_Adminhtml_Product_Grid extends Mage
|
|
| 225 |
{
|
| 226 |
return '';
|
| 227 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 228 |
}
|
| 57 |
$collection->addAttributeToSelect('status');
|
| 58 |
$collection->addAttributeToSelect('visibility');
|
| 59 |
}
|
| 60 |
+
|
| 61 |
+
$collection->getSelect()->joinLeft(
|
| 62 |
+
array('category_product' => $collection->getTable('catalog/category_product')), 'category_product.product_id = e.entity_id', array('categories' => new Zend_Db_Expr('group_concat(category_product.category_id)'))
|
| 63 |
+
);
|
| 64 |
|
| 65 |
+
$collection->groupByAttribute('entity_id');
|
| 66 |
+
|
| 67 |
$this->setCollection($collection);
|
| 68 |
|
| 69 |
parent::_prepareCollection();
|
| 70 |
$this->getCollection()->addWebsiteNamesToResult();
|
| 71 |
return $this;
|
| 72 |
}
|
| 73 |
+
|
| 74 |
+
protected function _afterLoadCollection()
|
| 75 |
+
{
|
| 76 |
+
foreach($this->getCollection() as $item) {
|
| 77 |
+
$item->setCategories(explode(',',$item->getCategories()));
|
| 78 |
+
}
|
| 79 |
+
}
|
| 80 |
|
| 81 |
protected function _addColumnFilterToCollection($column)
|
| 82 |
{
|
| 117 |
));
|
| 118 |
}
|
| 119 |
|
| 120 |
+
$categories = Mage::helper('profileolabs_shoppingflux')->getCategoriesWithParents('name', Mage::app()->getRequest()->getParam('store', null));
|
| 121 |
+
$this->addColumn('categories',
|
| 122 |
+
array(
|
| 123 |
+
'header'=> Mage::helper('catalog')->__('Categories'),
|
| 124 |
+
'index' => 'categories',
|
| 125 |
+
'type' => 'options',
|
| 126 |
+
'options' => $categories,
|
| 127 |
+
'filter_condition_callback' => array($this, '_filterCategoriesCondition')
|
| 128 |
+
));
|
| 129 |
+
|
| 130 |
$this->addColumn('type',
|
| 131 |
array(
|
| 132 |
'header'=> Mage::helper('catalog')->__('Type'),
|
| 248 |
{
|
| 249 |
return '';
|
| 250 |
}
|
| 251 |
+
|
| 252 |
+
protected function _filterCategoriesCondition($collection, $column) {
|
| 253 |
+
if (!$value = $column->getFilter()->getValue()) {
|
| 254 |
+
return;
|
| 255 |
+
}
|
| 256 |
+
|
| 257 |
+
$this->getCollection()->getSelect()->where('category_product.category_id = ?', $value);
|
| 258 |
+
}
|
| 259 |
}
|
app/code/community/Profileolabs/Shoppingflux/Model/Export/Flux.php
CHANGED
|
@@ -124,10 +124,10 @@ class Profileolabs_Shoppingflux_Model_Export_Flux extends Mage_Core_Model_Abstra
|
|
| 124 |
}
|
| 125 |
}
|
| 126 |
|
| 127 |
-
public function productNeedUpdate($
|
| 128 |
foreach (Mage::app()->getStores() as $store) {
|
| 129 |
$storeId = $store->getId();
|
| 130 |
-
$product = $this->_getProduct($
|
| 131 |
if ($product && $product->getId()) {
|
| 132 |
$fluxEntry = Mage::getModel('profileolabs_shoppingflux/export_flux')->getEntry($product->getSku(), $storeId);
|
| 133 |
if ($fluxEntry->getUpdateNeeded() != 1) {
|
| 124 |
}
|
| 125 |
}
|
| 126 |
|
| 127 |
+
public function productNeedUpdate($productId) {
|
| 128 |
foreach (Mage::app()->getStores() as $store) {
|
| 129 |
$storeId = $store->getId();
|
| 130 |
+
$product = $this->_getProduct($productId, $storeId);
|
| 131 |
if ($product && $product->getId()) {
|
| 132 |
$fluxEntry = Mage::getModel('profileolabs_shoppingflux/export_flux')->getEntry($product->getSku(), $storeId);
|
| 133 |
if ($fluxEntry->getUpdateNeeded() != 1) {
|
app/code/community/Profileolabs/Shoppingflux/Model/Export/Source/Attributes.php
CHANGED
|
@@ -33,16 +33,21 @@ class Profileolabs_Shoppingflux_Model_Export_Source_Attributes
|
|
| 33 |
'is_recurring',
|
| 34 |
);
|
| 35 |
|
|
|
|
|
|
|
| 36 |
public function toOptionArray()
|
| 37 |
{
|
| 38 |
-
|
| 39 |
-
|
| 40 |
-
|
| 41 |
-
|
| 42 |
-
|
| 43 |
-
|
| 44 |
-
|
| 45 |
-
|
| 46 |
-
|
|
|
|
|
|
|
|
|
|
| 47 |
}
|
| 48 |
}
|
| 33 |
'is_recurring',
|
| 34 |
);
|
| 35 |
|
| 36 |
+
protected $_attributes = null;
|
| 37 |
+
|
| 38 |
public function toOptionArray()
|
| 39 |
{
|
| 40 |
+
if(is_null($this->_attributes)) {
|
| 41 |
+
$this->_attributes = array();
|
| 42 |
+
|
| 43 |
+
$attributesArray= Mage::getSingleton('profileolabs_shoppingflux/export_convert_parser_product')->getExternalAttributes();
|
| 44 |
+
foreach($attributesArray as $k=>$v) {
|
| 45 |
+
if(!in_array($k, $this->_exceptions)) {
|
| 46 |
+
$this->_attributes[] = array('value'=>$k, 'label'=>$v);
|
| 47 |
+
}
|
| 48 |
+
}
|
| 49 |
+
array_unshift($this->_attributes, array("value"=>"none","label"=>""));
|
| 50 |
+
}
|
| 51 |
+
return $this->_attributes;
|
| 52 |
}
|
| 53 |
}
|
app/code/community/Profileolabs/Shoppingflux/controllers/Export/Adminhtml/ExportController.php
CHANGED
|
@@ -37,6 +37,14 @@ class Profileolabs_Shoppingflux_Export_Adminhtml_ExportController extends Mage_A
|
|
| 37 |
return $this;
|
| 38 |
}
|
| 39 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 40 |
/**
|
| 41 |
* Product grid for AJAX request
|
| 42 |
*/
|
| 37 |
return $this;
|
| 38 |
}
|
| 39 |
|
| 40 |
+
public function showAction() {
|
| 41 |
+
|
| 42 |
+
$this->loadLayout();
|
| 43 |
+
$this->renderLayout();
|
| 44 |
+
|
| 45 |
+
return $this;
|
| 46 |
+
}
|
| 47 |
+
|
| 48 |
/**
|
| 49 |
* Product grid for AJAX request
|
| 50 |
*/
|
app/code/community/Profileolabs/Shoppingflux/etc/adminhtml.xml
ADDED
|
@@ -0,0 +1,111 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version="1.0"?>
|
| 2 |
+
<config>
|
| 3 |
+
<menu>
|
| 4 |
+
<shoppingflux>
|
| 5 |
+
<title>Shopping Flux</title>
|
| 6 |
+
<sort_order>20</sort_order>
|
| 7 |
+
<children>
|
| 8 |
+
<manageorders translate="title" module="profileolabs_shoppingflux">
|
| 9 |
+
<title>Commandes</title>
|
| 10 |
+
<sort_order>200</sort_order>
|
| 11 |
+
<children>
|
| 12 |
+
<order translate="title" module="profileolabs_shoppingflux">
|
| 13 |
+
<title>Shopping flux orders</title>
|
| 14 |
+
<action>shoppingflux/manageorders_adminhtml_order</action>
|
| 15 |
+
<sort_order>10</sort_order>
|
| 16 |
+
</order>
|
| 17 |
+
<import translate="title" module="profileolabs_shoppingflux">
|
| 18 |
+
<title>Shopping flux import orders</title>
|
| 19 |
+
<action>shoppingflux/manageorders_adminhtml_import</action>
|
| 20 |
+
<sort_order>20</sort_order>
|
| 21 |
+
</import>
|
| 22 |
+
<log translate="title" module="profileolabs_shoppingflux">
|
| 23 |
+
<title>Shopping flux log</title>
|
| 24 |
+
<action>shoppingflux/manageorders_adminhtml_log</action>
|
| 25 |
+
<sort_order>30</sort_order>
|
| 26 |
+
</log>
|
| 27 |
+
</children>
|
| 28 |
+
</manageorders>
|
| 29 |
+
<export translate="title" module="profileolabs_shoppingflux">
|
| 30 |
+
<title>Export</title>
|
| 31 |
+
<sort_order>200</sort_order>
|
| 32 |
+
<children>
|
| 33 |
+
<show_flux translate="title" module="profileolabs_shoppingflux">
|
| 34 |
+
<title>Voir les flux</title>
|
| 35 |
+
<action>shoppingflux/export_adminhtml_export/show</action>
|
| 36 |
+
<sort_order>10</sort_order>
|
| 37 |
+
</show_flux>
|
| 38 |
+
<set_product translate="title" module="profileolabs_shoppingflux">
|
| 39 |
+
<title>Sélection de produit</title>
|
| 40 |
+
<action>shoppingflux/export_adminhtml_export/update</action>
|
| 41 |
+
<sort_order>20</sort_order>
|
| 42 |
+
</set_product>
|
| 43 |
+
</children>
|
| 44 |
+
</export>
|
| 45 |
+
<crons translate="title" module="profileolabs_shoppingflux">
|
| 46 |
+
<title>Suivi des crons</title>
|
| 47 |
+
<sort_order>900</sort_order>
|
| 48 |
+
<action>shoppingflux/manageorders_adminhtml_cron</action>
|
| 49 |
+
</crons>
|
| 50 |
+
</children>
|
| 51 |
+
</shoppingflux>
|
| 52 |
+
</menu>
|
| 53 |
+
<acl>
|
| 54 |
+
<resources>
|
| 55 |
+
<admin>
|
| 56 |
+
<children>
|
| 57 |
+
<system>
|
| 58 |
+
<children>
|
| 59 |
+
<config>
|
| 60 |
+
<children>
|
| 61 |
+
<shoppingflux translate="title" module="profileolabs_shoppingflux">
|
| 62 |
+
<title>Shoppingflux general</title>
|
| 63 |
+
</shoppingflux>
|
| 64 |
+
<shoppingflux_mo translate="title" module="profileolabs_shoppingflux">
|
| 65 |
+
<title>Shoppingflux manage orders</title>
|
| 66 |
+
</shoppingflux_mo>
|
| 67 |
+
<shoppingflux_export translate="title" module="profileolabs_shoppingflux">
|
| 68 |
+
<title>Shoppingflux Export des produits</title>
|
| 69 |
+
</shoppingflux_export>
|
| 70 |
+
</children>
|
| 71 |
+
</config>
|
| 72 |
+
</children>
|
| 73 |
+
</system>
|
| 74 |
+
<shoppingflux>
|
| 75 |
+
<title>Shopping Flux</title>
|
| 76 |
+
<children>
|
| 77 |
+
<manageorders translate="title" module="profileolabs_shoppingflux">
|
| 78 |
+
<title>Commandes</title>
|
| 79 |
+
<children>
|
| 80 |
+
<order translate="title" module="profileolabs_shoppingflux">
|
| 81 |
+
<title>Shopping flux orders</title>
|
| 82 |
+
</order>
|
| 83 |
+
<import translate="title" module="profileolabs_shoppingflux">
|
| 84 |
+
<title>Shopping flux import orders</title>
|
| 85 |
+
</import>
|
| 86 |
+
<log translate="title" module="profileolabs_shoppingflux">
|
| 87 |
+
<title>Shopping flux log</title>
|
| 88 |
+
</log>
|
| 89 |
+
</children>
|
| 90 |
+
</manageorders>
|
| 91 |
+
<export>
|
| 92 |
+
<title>Export</title>
|
| 93 |
+
<children>
|
| 94 |
+
<show_flux translate="title" module="profileolabs_shoppingflux">
|
| 95 |
+
<title>Voir les flux</title>
|
| 96 |
+
</show_flux>
|
| 97 |
+
<set_product translate="title" module="profileolabs_shoppingflux">
|
| 98 |
+
<title>Sélection de produit</title>
|
| 99 |
+
</set_product>
|
| 100 |
+
</children>
|
| 101 |
+
</export>
|
| 102 |
+
<crons translate="title" module="profileolabs_shoppingflux">
|
| 103 |
+
<title>Suivi des crons</title>
|
| 104 |
+
</crons>
|
| 105 |
+
</children>
|
| 106 |
+
</shoppingflux>
|
| 107 |
+
</children>
|
| 108 |
+
</admin>
|
| 109 |
+
</resources>
|
| 110 |
+
</acl>
|
| 111 |
+
</config>
|
app/code/community/Profileolabs/Shoppingflux/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Profileolabs_Shoppingflux>
|
| 5 |
-
<version>0.7.
|
| 6 |
</Profileolabs_Shoppingflux>
|
| 7 |
</modules>
|
| 8 |
<admin>
|
|
@@ -218,119 +218,6 @@
|
|
| 218 |
</Profileolabs_Shoppingflux>
|
| 219 |
</modules>
|
| 220 |
</translate>
|
| 221 |
-
<menu>
|
| 222 |
-
<shoppingflux>
|
| 223 |
-
<title>Shopping Flux</title>
|
| 224 |
-
<sort_order>20</sort_order>
|
| 225 |
-
<depends>
|
| 226 |
-
<module>Profileolabs_Shoppingflux</module>
|
| 227 |
-
</depends>
|
| 228 |
-
<children>
|
| 229 |
-
<manageorders translate="title" module="profileolabs_shoppingflux">
|
| 230 |
-
<title>Commandes</title>
|
| 231 |
-
<sort_order>200</sort_order>
|
| 232 |
-
<children>
|
| 233 |
-
<order translate="title" module="profileolabs_shoppingflux">
|
| 234 |
-
<title>Shopping flux orders</title>
|
| 235 |
-
<action>shoppingflux/manageorders_adminhtml_order</action>
|
| 236 |
-
<sort_order>10</sort_order>
|
| 237 |
-
</order>
|
| 238 |
-
<import translate="title" module="profileolabs_shoppingflux">
|
| 239 |
-
<title>Shopping flux import orders</title>
|
| 240 |
-
<action>shoppingflux/manageorders_adminhtml_import</action>
|
| 241 |
-
<sort_order>20</sort_order>
|
| 242 |
-
</import>
|
| 243 |
-
<log translate="title" module="profileolabs_shoppingflux">
|
| 244 |
-
<title>Shopping flux log</title>
|
| 245 |
-
<action>shoppingflux/manageorders_adminhtml_log</action>
|
| 246 |
-
<sort_order>30</sort_order>
|
| 247 |
-
</log>
|
| 248 |
-
</children>
|
| 249 |
-
</manageorders>
|
| 250 |
-
<export translate="title" module="profileolabs_shoppingflux">
|
| 251 |
-
<title>Export</title>
|
| 252 |
-
<sort_order>200</sort_order>
|
| 253 |
-
<children>
|
| 254 |
-
<!-- @deprecated since version 0.1.1 -->
|
| 255 |
-
<!-- <run_export translate="title" module="profileolabs_shoppingflux">
|
| 256 |
-
<title>Lancer l'export</title>
|
| 257 |
-
<action>shoppingflux/export_adminhtml_export/edit</action>
|
| 258 |
-
<sort_order>10</sort_order>
|
| 259 |
-
</run_export> -->
|
| 260 |
-
<set_product translate="title" module="profileolabs_shoppingflux">
|
| 261 |
-
<title>Sélection de produit</title>
|
| 262 |
-
<action>shoppingflux/export_adminhtml_export/update</action>
|
| 263 |
-
<sort_order>20</sort_order>
|
| 264 |
-
</set_product>
|
| 265 |
-
</children>
|
| 266 |
-
</export>
|
| 267 |
-
<crons translate="title" module="profileolabs_shoppingflux">
|
| 268 |
-
<title>Suivi des crons</title>
|
| 269 |
-
<sort_order>900</sort_order>
|
| 270 |
-
<action>shoppingflux/manageorders_adminhtml_cron</action>
|
| 271 |
-
</crons>
|
| 272 |
-
</children>
|
| 273 |
-
</shoppingflux>
|
| 274 |
-
</menu>
|
| 275 |
-
<acl>
|
| 276 |
-
<resources>
|
| 277 |
-
<admin>
|
| 278 |
-
<children>
|
| 279 |
-
<system>
|
| 280 |
-
<children>
|
| 281 |
-
<config>
|
| 282 |
-
<children>
|
| 283 |
-
<shoppingflux translate="title" module="profileolabs_shoppingflux">
|
| 284 |
-
<title>Shoppingflux general</title>
|
| 285 |
-
</shoppingflux>
|
| 286 |
-
<shoppingflux_mo translate="title" module="profileolabs_shoppingflux">
|
| 287 |
-
<title>Shoppingflux manage orders</title>
|
| 288 |
-
</shoppingflux_mo>
|
| 289 |
-
<shoppingflux_export translate="title" module="profileolabs_shoppingflux">
|
| 290 |
-
<title>Shoppingflux Export des produits</title>
|
| 291 |
-
</shoppingflux_export>
|
| 292 |
-
</children>
|
| 293 |
-
</config>
|
| 294 |
-
</children>
|
| 295 |
-
</system>
|
| 296 |
-
<shoppingflux>
|
| 297 |
-
<title>Shopping Flux</title>
|
| 298 |
-
<children>
|
| 299 |
-
<manageorders translate="title" module="profileolabs_shoppingflux">
|
| 300 |
-
<title>Commandes</title>
|
| 301 |
-
<children>
|
| 302 |
-
<order translate="title" module="profileolabs_shoppingflux">
|
| 303 |
-
<title>Shopping flux orders</title>
|
| 304 |
-
</order>
|
| 305 |
-
<import translate="title" module="profileolabs_shoppingflux">
|
| 306 |
-
<title>Shopping flux import orders</title>
|
| 307 |
-
</import>
|
| 308 |
-
<log translate="title" module="profileolabs_shoppingflux">
|
| 309 |
-
<title>Shopping flux log</title>
|
| 310 |
-
</log>
|
| 311 |
-
</children>
|
| 312 |
-
</manageorders>
|
| 313 |
-
<export>
|
| 314 |
-
<title>Export</title>
|
| 315 |
-
<children>
|
| 316 |
-
<!-- @deprecated since version 0.1.1 -->
|
| 317 |
-
<!-- <run_export translate="title" module="profileolabs_shoppingflux">
|
| 318 |
-
<title>Lancer l'export</title>
|
| 319 |
-
</run_export> -->
|
| 320 |
-
<set_product translate="title" module="profileolabs_shoppingflux">
|
| 321 |
-
<title>Sélection de produit</title>
|
| 322 |
-
</set_product>
|
| 323 |
-
</children>
|
| 324 |
-
</export>
|
| 325 |
-
<crons translate="title" module="profileolabs_shoppingflux">
|
| 326 |
-
<title>Suivi des crons</title>
|
| 327 |
-
</crons>
|
| 328 |
-
</children>
|
| 329 |
-
</shoppingflux>
|
| 330 |
-
</children>
|
| 331 |
-
</admin>
|
| 332 |
-
</resources>
|
| 333 |
-
</acl>
|
| 334 |
<events>
|
| 335 |
<catalog_product_delete_after_done>
|
| 336 |
<observers>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Profileolabs_Shoppingflux>
|
| 5 |
+
<version>0.7.2</version>
|
| 6 |
</Profileolabs_Shoppingflux>
|
| 7 |
</modules>
|
| 8 |
<admin>
|
| 218 |
</Profileolabs_Shoppingflux>
|
| 219 |
</modules>
|
| 220 |
</translate>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 221 |
<events>
|
| 222 |
<catalog_product_delete_after_done>
|
| 223 |
<observers>
|
app/design/adminhtml/default/default/layout/profileolabs_shoppingflux.xml
CHANGED
|
@@ -29,19 +29,6 @@
|
|
| 29 |
</block>
|
| 30 |
</reference>
|
| 31 |
</shoppingflux_export_adminhtml_export_edit>
|
| 32 |
-
<shoppingflux_export_adminhtml_export_run>
|
| 33 |
-
<remove name="root"/>
|
| 34 |
-
<block type="adminhtml/page" name="convert_root" output="toHtml" template="page.phtml">
|
| 35 |
-
<block type="adminhtml/page_head" name="convert_root_head" as="head" template="page/head.phtml">
|
| 36 |
-
<action method="addJs"><script>prototype/prototype.js</script></action>
|
| 37 |
-
<action method="addJs"><script>prototype/validation.js</script></action>
|
| 38 |
-
<action method="addJs"><script>varien/js.js</script></action>
|
| 39 |
-
<action method="addJs"><script>mage/translate.js</script></action>
|
| 40 |
-
<action method="addJs"><script>mage/adminhtml/tools.js</script></action>
|
| 41 |
-
</block>
|
| 42 |
-
<block type="profileolabs_shoppingflux/export_adminhtml_process" name="export.process.run" template="profileolabs/shoppingflux/export/process.phtml" output="toHtml"/>
|
| 43 |
-
</block>
|
| 44 |
-
</shoppingflux_export_adminhtml_export_run>
|
| 45 |
<shoppingflux_export_adminhtml_export_update>
|
| 46 |
<reference name="content">
|
| 47 |
<block type="profileolabs_shoppingflux/export_adminhtml_product" name="products_list">
|
|
@@ -51,6 +38,11 @@
|
|
| 51 |
</block>
|
| 52 |
</reference>
|
| 53 |
</shoppingflux_export_adminhtml_export_update>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 54 |
|
| 55 |
<adminhtml_sales_order_view>
|
| 56 |
<reference name="order_totals">
|
| 29 |
</block>
|
| 30 |
</reference>
|
| 31 |
</shoppingflux_export_adminhtml_export_edit>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 32 |
<shoppingflux_export_adminhtml_export_update>
|
| 33 |
<reference name="content">
|
| 34 |
<block type="profileolabs_shoppingflux/export_adminhtml_product" name="products_list">
|
| 38 |
</block>
|
| 39 |
</reference>
|
| 40 |
</shoppingflux_export_adminhtml_export_update>
|
| 41 |
+
<shoppingflux_export_adminhtml_export_show>
|
| 42 |
+
<reference name="content">
|
| 43 |
+
<block type="profileolabs_shoppingflux/export_adminhtml_feed" name="feed_list" />
|
| 44 |
+
</reference>
|
| 45 |
+
</shoppingflux_export_adminhtml_export_show>
|
| 46 |
|
| 47 |
<adminhtml_sales_order_view>
|
| 48 |
<reference name="order_totals">
|
app/design/adminhtml/default/default/template/profileolabs/shoppingflux/export/feed.phtml
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<div class="content-header">
|
| 2 |
+
<table cellspacing="0">
|
| 3 |
+
<tr>
|
| 4 |
+
<td style="width:50%;"><h3 class="icon-head head-products"><?php echo Mage::helper('profileolabs_shoppingflux')->__('Liste des flux disponibles') ?></h3></td>
|
| 5 |
+
<td class="a-right">
|
| 6 |
+
<?php echo $this->getButtonsHtml() ?>
|
| 7 |
+
</td>
|
| 8 |
+
</tr>
|
| 9 |
+
</table>
|
| 10 |
+
</div>
|
| 11 |
+
<div>
|
| 12 |
+
<dl>
|
| 13 |
+
<?php foreach(Mage::app()->getStores() as $store): ?>
|
| 14 |
+
<?php if($this->storeHasFeed($store)): ?>
|
| 15 |
+
<?php $_storeId = $store->getId() ?>
|
| 16 |
+
<?php $_feedUrl = $this->getFeedUrl($store); ?>
|
| 17 |
+
<dt><?php echo $storeId ?> - <?php echo $store->getName() ?></dt>
|
| 18 |
+
<dd><a href="<?php echo $_feedUrl ?>" target="_blank"><?php echo $_feedUrl ?></a></dd>
|
| 19 |
+
<?php endif; ?>
|
| 20 |
+
<?php endforeach ?>
|
| 21 |
+
</dl>
|
| 22 |
+
</div>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Profileolabs_Shoppingflux</name>
|
| 4 |
-
<version>0.7.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/gpl-license.php">GNU General Public License (GPL)</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -11,9 +11,9 @@
|
|
| 11 |
<notes>- Minor bugfixes & improvements
|
| 12 |
</notes>
|
| 13 |
<authors><author><name>ShoppingFlux</name><user>ShoppingFlux</user><email>olivier.levy@gmail.com</email></author></authors>
|
| 14 |
-
<date>2014-
|
| 15 |
-
<time>
|
| 16 |
-
<contents><target name="magecommunity"><dir name="Profileolabs"><dir name="Shoppingflux"><dir name="Block"><dir name="Export"><dir name="Adminhtml"><dir name="Catalog"><dir name="Category"><dir name="Edit"><file name="Form.php" hash="da466a657f2b80567ef576711a190805"/></dir><dir name="Tab"><file name="Default.php" hash="7b1c1f77624493bd1017cd3cd71e4bba"/></dir></dir></dir><file name="Process.php" hash="2e5099bf9054280f351ea170ffeb419f"/><dir name="Product"><file name="Grid.php" hash="
|
| 17 |
<compatible/>
|
| 18 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
| 19 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Profileolabs_Shoppingflux</name>
|
| 4 |
+
<version>0.7.2</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/gpl-license.php">GNU General Public License (GPL)</license>
|
| 7 |
<channel>community</channel>
|
| 11 |
<notes>- Minor bugfixes & improvements
|
| 12 |
</notes>
|
| 13 |
<authors><author><name>ShoppingFlux</name><user>ShoppingFlux</user><email>olivier.levy@gmail.com</email></author></authors>
|
| 14 |
+
<date>2014-06-03</date>
|
| 15 |
+
<time>08:13:06</time>
|
| 16 |
+
<contents><target name="magecommunity"><dir name="Profileolabs"><dir name="Shoppingflux"><dir name="Block"><dir name="Export"><dir name="Adminhtml"><dir name="Catalog"><dir name="Category"><dir name="Edit"><file name="Form.php" hash="da466a657f2b80567ef576711a190805"/></dir><dir name="Tab"><file name="Default.php" hash="7b1c1f77624493bd1017cd3cd71e4bba"/></dir></dir></dir><file name="Feed.php" hash="02274fcb2c95199c826d8e22be5bb16a"/><file name="Process.php" hash="2e5099bf9054280f351ea170ffeb419f"/><dir name="Product"><file name="Grid.php" hash="463fc0fc55a999c1150250159ef5e475"/></dir><file name="Product.php" hash="f71a0d0f25e2484f74f1ceaeee514d3f"/><dir name="Widget"><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Bool.php" hash="2717fd3964299bb372c355427c8136d7"/></dir></dir></dir></dir></dir><file name="Flow.php" hash="aed0df354559ecb9d36d3ddf854c301a"/><file name="Flux.php" hash="c592023b56306258439287d28edf6c85"/><file name="Tracking.php" hash="a01f384121dda81f8ee3faa80ee3a32a"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><dir name="Manageorders"><dir name="Adminhtml"><dir name="Cron"><file name="Grid.php" hash="ddfd5d9374446afafef1f545839e869e"/></dir><file name="Cron.php" hash="1a6a4042d3270b56e2dadc80f5c12cfa"/><file name="Import.php" hash="0d675a1731ca646ba57989b8545f4682"/><dir name="Log"><file name="Grid.php" hash="9170b01b3a6d3d558801faeba745390f"/></dir><file name="Log.php" hash="3336bc53002b82b4ab16d18a4e68e0cb"/><dir name="Order"><file name="Grid.php" hash="cdfc7764892dfb6df90f2d56337b448a"/></dir><file name="Order.php" hash="a6d45eb0146fb448f72348724c3151df"/><dir name="System"><dir name="Config"><dir name="Form"><dir name="Fieldset"><dir name="Shipping"><file name="Method.php" hash="e4cca2caf90ef55f13c3d55aff5c72bb"/></dir></dir></dir></dir></dir></dir><dir name="Payment"><dir name="Info"><file name="Purchaseorder.php" hash="df942f5c9a19506ef2bf70ca1d4da809"/></dir></dir></dir><dir name="Tracking"><file name="Buyline.php" hash="a60b19ed533b265a7a2aafe75c03c0fa"/><file name="Roi.php" hash="e34e26dffead694a35798d0397782d55"/></dir></dir><dir name="Helper"><file name="Data.php" hash="4fefcb781dccf27e10a02d4b21d0e9d8"/></dir><dir name="Model"><dir name="Attribute"><dir name="Source"><file name="Category.php" hash="49f1f7959c4741c22bbf79b7e0bd24e7"/></dir></dir><file name="Config.php" hash="3588ccba38be5863b90e5dcb02277818"/><dir name="Export"><dir name="Convert"><dir name="Parser"><file name="Product.php" hash="4e50613b82ba84c35eb87f991645c118"/></dir></dir><file name="Flow.php" hash="46659d199b712b0cd837bc10a05d53f0"/><file name="Flux.php" hash="cac940fab853fd4b890404587a682447"/><file name="Observer.php" hash="42c8a7577a42f679ea2ad491bc5ee9a1"/><dir name="Rewrite"><dir name="Catalog"><file name="Config.php" hash="c87b13b0141123b80cb1ac33eaf75715"/></dir><dir name="CatalogInventory"><dir name="Stock"><file name="Item.php" hash="5249964f31fda6d5b7ff9587e713ca81"/></dir></dir></dir><dir name="Source"><file name="Attributes.php" hash="8b82fd8ed7e72285e1e97e68b48f7283"/><file name="Attributesprice.php" hash="6cddf3b9562c8dbc56e670b377e341c1"/><dir name="Category"><file name="Level.php" hash="477d3dccefe5720eedc6b5d7a7110c9a"/></dir><file name="Visibility.php" hash="c2a1494bc2e554074d19c58523c450b2"/></dir><file name="Updates.php" hash="6a12528f1ba69f0e0240ba471b471578"/><file name="Xml.php" hash="d6574955d2a108a91c1ebf84feb1b02b"/><file name="Xmlflow.deprecated.php" hash="960d81e05b332cdb16449029b07f0eca"/><file name="Xmlflow.php" hash="82815362cf6b2127ef961be79e48c127"/></dir><dir name="Manageorders"><dir name="Convert"><file name="Customer.php" hash="cab61c630739661f594fdf1fc1193ce8"/></dir><dir name="Export"><file name="Shipments.php" hash="20e617e183366ef5447ea653aa989065"/></dir><file name="Log.php" hash="3ce67bed38c452615ba8cfd51f48cbf3"/><file name="Observer.php" hash="cb5fa21c1e339b0a8963a66aa9efda60"/><file name="Order.php" hash="24dbb279521678da35e991a1976d28f6"/><file name="OrderOLD.php" hash="f25b3ce2d3610eecf201e2d2421aa460"/><dir name="Payment"><dir name="Method"><file name="Purchaseorder.php" hash="4ed46b995590d286b3154e0bbf7ebc63"/></dir></dir><file name="Product.php" hash="0041c5ebcd0aa8ca17f5c1a4f07ec03d"/><dir name="Shipping"><dir name="Carrier"><file name="Shoppingflux.php" hash="1d56b8eac4d74d6f9cce1e8c5a6613bb"/></dir><file name="Method.php" hash="0ebc060042e201b605473ce50bc7aa90"/></dir></dir><dir name="Mysql4"><dir name="Export"><dir name="Flux"><file name="Collection.php" hash="25a6420bb66aeefb6a8ac0a9e6fc538f"/></dir><file name="Flux.php" hash="6140eeee9d40615eaaba736377aba17e"/><dir name="Updates"><file name="Collection.php" hash="21b355b1db82e4b8a5d1950ac2ffbd18"/></dir><file name="Updates.php" hash="02ef11d051020470231e470f3232f862"/></dir><dir name="Manageorders"><dir name="Export"><dir name="Shipments"><file name="Collection.php" hash="fcdf3c607a8d479beb10a53a618aa225"/></dir><file name="Shipments.php" hash="e06dfaf254a5fd3d8649685b56874258"/></dir><dir name="Log"><file name="Collection.php" hash="0efd8c68937edf98cc9f9bb35bd76f79"/></dir><file name="Log.php" hash="b30bbf3ead209d69993546b29f72ecd7"/><dir name="Shipping"><dir name="Method"><file name="Collection.php" hash="7b2c8fb56625953ea8cd79cc7ddcc9df"/></dir><file name="Method.php" hash="a919a6c61ad6ddefd19ffc287eaa7325"/></dir></dir></dir><dir name="Service"><dir name="Http"><dir name="Client"><dir name="Adapter"><file name="Curl.php" hash="659ab165cdd8492fdc7ee08b515732ac"/><file name="Stream.php" hash="c3a61972f5ffb625dba59ba53365965d"/></dir></dir></dir></dir><file name="Service.php" hash="3bbadfa583da0cb1ad46b4d0bebcdcc1"/><dir name="System"><dir name="Config"><dir name="Backend"><file name="Apikey.php" hash="90036cf58c627fcc68920af912171a0c"/><file name="Refresh.php" hash="d53cbdc6ae73c146af67ef5f20d9e4e8"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="GeneralController.php" hash="554d7ddd341b073dd566b3ba21f0bd19"/></dir><dir name="Export"><dir name="Adminhtml"><file name="CategoryController.php" hash="d882797e1e0fbff25b312768c6569f04"/><file name="ExportController.php" hash="b496415fe06e284c62692813d8000250"/></dir><file name="FluxController.php" hash="b4f6146a69f35d23bc1b3f29964d9779"/></dir><dir name="Manageorders"><dir name="Adminhtml"><file name="CronController.php" hash="9c43b1b18fb883b4140aaa1d3f82cb1c"/><file name="ImportController.php" hash="22d7190ab3d8374498d922616ba5795a"/><file name="LogController.php" hash="f941a1d2512c2461d614a94682afc8c3"/><file name="OrderController.php" hash="7e64c4b34250a1f949be5414bda7ae86"/></dir></dir></dir><dir name="doc"><file name="doc_module_1.4.pdf" hash="5590a49838bd67f70f0cacf9605cea2b"/></dir><dir name="etc"><file name="adminhtml.xml" hash="c7488b04c573bd896c74198b52211d1f"/><file name="config.xml" hash="3f60a9d1e59c0915730ec812717fda4b"/><file name="system.xml" hash="771a38b0da6b20a026782b411dfaa4cf"/></dir><dir name="sql"><dir name="profileolabs_shoppingflux_setup"><file name="mysql4-install-0.1.0.php" hash="87c47ba97a55bd71dada152b52736be2"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="0f95646d855413c52928ed4c258aacb1"/><file name="mysql4-upgrade-0.3.13-0.3.14.php" hash="4f6a5399ad06457f0ebf57b33353ebe2"/><file name="mysql4-upgrade-0.3.14-0.3.15.php" hash="6215917eef61544fc6f4193d31956df4"/><file name="mysql4-upgrade-0.3.17-0.3.18.php" hash="112b34baecd80300682bda9ba69c8970"/><file name="mysql4-upgrade-0.4.2-0.4.3.php" hash="2322a9d2b5130bc78699c1953df87a04"/><file name="mysql4-upgrade-0.4.6-0.5.0.php" hash="02be6c02a8c77e642ef3e40ded1ba8be"/><file name="mysql4-upgrade-0.5.1-0.5.2.php" hash="0e5414628efee519deff6aff301651c7"/><file name="mysql4-upgrade-0.5.3-0.5.4.php" hash="9dfb5e5895a9a2973dba57a049d9d379"/><file name="mysql4-upgrade-0.5.5-0.5.6.php" hash="e0ebe03688b7eac8252efa0d5b9b4258"/><file name="mysql4-upgrade-0.6.5-0.6.6.php" hash="c58a1219b2858d50a3d72e77ac6ee43c"/></dir></dir></dir><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir></target><target name="mageetc"><dir name="modules"><file name="Profileolabs_Shoppingflux.xml" hash="73ec83cf32c72884815a3cac9f754a54"/></dir></target><target name="magelocale"><dir><dir name="fr_FR"><file name="Profileolabs_Shoppingflux.csv" hash="976e5917ba859e727c4468e2a06478ab"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="profileolabs_shoppingflux.xml" hash="7787fbcc03edc0b4b68d51e211e82049"/></dir><dir name="template"><dir name="profileolabs"><dir name="shoppingflux"><dir name="export"><dir name="category"><file name="edit.phtml" hash="8af812638245a0aa59a1c90aa6c20a4f"/></dir><file name="edit.phtml" hash="729868cce29296bbbc86207830e4061d"/><file name="feed.phtml" hash="e17cd27faf955480224f4b32bc75a6f5"/><file name="process.phtml" hash="1dee42b2f14c0862446e5b475aaccad3"/><file name="product.phtml" hash="cca57adec209091d1d80cebbbe0c1172"/></dir><dir name="manageorders"><file name="import.phtml" hash="397a0f85d61db23006e6cff181ddac5b"/><dir name="payment"><dir name="info"><file name="purchaseorder.phtml" hash="782768b0e4836b25f46443dda098db29"/></dir></dir><dir name="sales"><dir name="order"><file name="total.phtml" hash="ded51585527ad918412dd5f0d0a9b2a7"/></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="profileolabs_shoppingflux.xml" hash="672feff0a0895f920d4037ff131bf5ac"/></dir></dir></dir><dir name="default"><dir name="default"><dir name="layout"><file name="profileolabs_shoppingflux.xml" hash="672feff0a0895f920d4037ff131bf5ac"/></dir></dir></dir></dir></target></contents>
|
| 17 |
<compatible/>
|
| 18 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
| 19 |
</package>
|
