Version Notes
* Correção ao importar pedido com status em branco.
* Correção de uma falha que fazia com que o processamento em lote de produtos falhava em caso de single_store
Download this release
Release Info
| Developer | Anymarket |
| Extension | d7db67d0d012350a01ce05c31f91754d |
| Version | 2.5.1 |
| Comparing to | |
| See all releases | |
Code changes from version 2.5.0 to 2.5.1
- app/code/community/DB1/AnyMarket/Block/Adminhtml/Anymarketorders/Grid.php +9 -0
- app/code/community/DB1/AnyMarket/Block/Adminhtml/Anymarketproducts/Grid.php +9 -0
- app/code/community/DB1/AnyMarket/Helper/Order.php +1 -1
- app/code/community/DB1/AnyMarket/Helper/Queue.php +2 -0
- app/code/community/DB1/AnyMarket/etc/config.xml +1 -1
- app/code/community/DB1/AnyMarket/etc/system.xml +1 -1
- package.xml +6 -16
app/code/community/DB1/AnyMarket/Block/Adminhtml/Anymarketorders/Grid.php
CHANGED
|
@@ -169,6 +169,15 @@ class DB1_AnyMarket_Block_Adminhtml_Anymarketorders_Grid extends Mage_Adminhtml_
|
|
| 169 |
$this->setMassactionIdField('entity_id');
|
| 170 |
$this->getMassactionBlock()->setFormFieldName('anymarketorders');
|
| 171 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 172 |
$this->getMassactionBlock()->addItem(
|
| 173 |
'export',
|
| 174 |
array(
|
| 169 |
$this->setMassactionIdField('entity_id');
|
| 170 |
$this->getMassactionBlock()->setFormFieldName('anymarketorders');
|
| 171 |
|
| 172 |
+
$this->getMassactionBlock()->addItem(
|
| 173 |
+
'delete',
|
| 174 |
+
array(
|
| 175 |
+
'label'=> Mage::helper('db1_anymarket')->__('Delete'),
|
| 176 |
+
'url' => $this->getUrl('*/*/massDelete'),
|
| 177 |
+
'confirm' => Mage::helper('db1_anymarket')->__('Are you sure?')
|
| 178 |
+
)
|
| 179 |
+
);
|
| 180 |
+
|
| 181 |
$this->getMassactionBlock()->addItem(
|
| 182 |
'export',
|
| 183 |
array(
|
app/code/community/DB1/AnyMarket/Block/Adminhtml/Anymarketproducts/Grid.php
CHANGED
|
@@ -178,6 +178,15 @@ class DB1_AnyMarket_Block_Adminhtml_Anymarketproducts_Grid extends Mage_Adminhtm
|
|
| 178 |
$this->setMassactionIdField('entity_id');
|
| 179 |
$this->getMassactionBlock()->setFormFieldName('anymarketproducts');
|
| 180 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 181 |
$this->getMassactionBlock()->addItem(
|
| 182 |
'sincronizar',
|
| 183 |
array(
|
| 178 |
$this->setMassactionIdField('entity_id');
|
| 179 |
$this->getMassactionBlock()->setFormFieldName('anymarketproducts');
|
| 180 |
|
| 181 |
+
$this->getMassactionBlock()->addItem(
|
| 182 |
+
'delete',
|
| 183 |
+
array(
|
| 184 |
+
'label'=> Mage::helper('db1_anymarket')->__('Delete'),
|
| 185 |
+
'url' => $this->getUrl('*/*/massDelete'),
|
| 186 |
+
'confirm' => Mage::helper('db1_anymarket')->__('Are you sure?')
|
| 187 |
+
)
|
| 188 |
+
);
|
| 189 |
+
|
| 190 |
$this->getMassactionBlock()->addItem(
|
| 191 |
'sincronizar',
|
| 192 |
array(
|
app/code/community/DB1/AnyMarket/Helper/Order.php
CHANGED
|
@@ -584,7 +584,7 @@ class DB1_AnyMarket_Helper_Order extends DB1_AnyMarket_Helper_Data
|
|
| 584 |
}
|
| 585 |
}
|
| 586 |
|
| 587 |
-
if($
|
| 588 |
if($stateMage == Mage_Sales_Model_Order::STATE_COMPLETE){
|
| 589 |
$history = $order->addStatusHistoryComment('Finalizado pelo AnyMarket.', false);
|
| 590 |
$history->setIsCustomerNotified(false);
|
| 584 |
}
|
| 585 |
}
|
| 586 |
|
| 587 |
+
if($statusMage != Mage_Sales_Model_Order::STATE_NEW){
|
| 588 |
if($stateMage == Mage_Sales_Model_Order::STATE_COMPLETE){
|
| 589 |
$history = $order->addStatusHistoryComment('Finalizado pelo AnyMarket.', false);
|
| 590 |
$history->setIsCustomerNotified(false);
|
app/code/community/DB1/AnyMarket/Helper/Queue.php
CHANGED
|
@@ -46,6 +46,8 @@ class DB1_AnyMarket_Helper_Queue extends DB1_AnyMarket_Helper_Data
|
|
| 46 |
$arrValueStore = array_values($anymarketQueue->getStoreId());
|
| 47 |
$storeID = array_shift($arrValueStore);
|
| 48 |
|
|
|
|
|
|
|
| 49 |
$cronEnabled = Mage::getStoreConfig('anymarket_section/anymarket_cron_group/anymarket_queue_field', $storeID);
|
| 50 |
if($cronEnabled == '1' || $typeExec == "FORCE") {
|
| 51 |
$typeSincProd = Mage::getStoreConfig('anymarket_section/anymarket_integration_prod_group/anymarket_type_prod_sync_field', $storeID);
|
| 46 |
$arrValueStore = array_values($anymarketQueue->getStoreId());
|
| 47 |
$storeID = array_shift($arrValueStore);
|
| 48 |
|
| 49 |
+
$storeID = ($storeID != null && $storeID != "0") ? $storeID : 1;
|
| 50 |
+
|
| 51 |
$cronEnabled = Mage::getStoreConfig('anymarket_section/anymarket_cron_group/anymarket_queue_field', $storeID);
|
| 52 |
if($cronEnabled == '1' || $typeExec == "FORCE") {
|
| 53 |
$typeSincProd = Mage::getStoreConfig('anymarket_section/anymarket_integration_prod_group/anymarket_type_prod_sync_field', $storeID);
|
app/code/community/DB1/AnyMarket/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<DB1_AnyMarket>
|
| 5 |
-
<version>2.5.
|
| 6 |
</DB1_AnyMarket>
|
| 7 |
</modules>
|
| 8 |
<global>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<DB1_AnyMarket>
|
| 5 |
+
<version>2.5.1</version>
|
| 6 |
</DB1_AnyMarket>
|
| 7 |
</modules>
|
| 8 |
<global>
|
app/code/community/DB1/AnyMarket/etc/system.xml
CHANGED
|
@@ -857,7 +857,7 @@
|
|
| 857 |
<comment>
|
| 858 |
<