'.
- Mage::helper('M2ePro')->__('Repricing ON') . ': ' .
+ Mage::helper('M2ePro')->__('Repricing') . ': ' .
'
+ Please note that the Price value(s) shown in the grid might + be different from the actual one from Amazon. It is caused by the delay + in the values updating made via the Repricing Service' ); + if ((int)$row->getData('is_repricing_disabled') == 1) { + $image = 'money_disabled'; + $text = Mage::helper('M2ePro')->__( + 'This product is disabled on Amazon Repricing Tool.
+ You can map it to Magento Product and Move into M2E Pro Listing to make the + Price being updated via M2E Pro.' + ); + } + $html = << +
})
+ src="{$this->getSkinUrl('M2ePro/images/'.$image.'.png')}">
+ }){kind=icon}
})
+
+
+HTML;
+ } elseif (!$row->getData('is_variation_parent')) {
+ $image = 'money';
$text = Mage::helper('M2ePro')->__(
- 'Some Child Products are used by Amazon Repricing Tool.
- The Price cannot be updated through the M2E Pro.'
- );
- } else {
- $text = Mage::helper('M2ePro')->__(
- 'This product is used by Amazon Repricing Tool.
- The Price cannot be updated through the M2E Pro.'
+ 'This Product is used by Amazon Repricing Tool, so its Price cannot be managed via M2E Pro.+ Please note that the Price value shown in the grid might be different + from the actual one from Amazon. It is caused by the delay in the values + updating made via the Repricing Service.' ); - } - $repricingHtml = << + if ((int)$row->getData('is_repricing_disabled') == 1) { + $image = 'money_disabled'; + + if ($this->getId() == 'amazonListingSearchOtherGrid') { + $text = Mage::helper('M2ePro')->__( + 'This product is disabled on Amazon Repricing Tool.
+ You can map it to Magento Product and Move into M2E Pro Listing to make the + Price being updated via M2E Pro.' + ); + } else { + $text = Mage::helper('M2ePro')->__( + 'This product is disabled on Amazon Repricing Tool. + The Price is updated through the M2E Pro.' + ); + } + } + + $repricingHtml = <<
+ src="{$this->getSkinUrl('M2ePro/images/'.$image.'.png')}">
HTML;
+ }
}
$onlineMinPrice = $row->getData('min_online_price');
@@ -736,7 +815,7 @@ public function callbackColumnPrice($value, $row, $column, $isExport)
$marketplaceId = $row->getData('marketplace_id');
$currency = Mage::helper('M2ePro/Component_Amazon')
- ->getCachedObject('Marketplace',$marketplaceId)
+ ->getCachedObject('Marketplace', $marketplaceId)
->getChildObject()
->getDefaultCurrency();
@@ -758,7 +837,7 @@ public function callbackColumnPrice($value, $row, $column, $isExport)
$resultHtml = '';
$salePrice = $row->getData('online_sale_price');
- if (!$row->getData('is_variation_parent') && (float)$salePrice > 0) {
+ if (!$row->getData('is_variation_parent') && (float)$salePrice > 0 && !$row->getData('is_repricing')) {
$currentTimestamp = strtotime(Mage::helper('M2ePro')->getCurrentGmtDate(false,'Y-m-d 00:00:00'));
$startDateTimestamp = strtotime($row->getData('online_sale_price_start_date'));
@@ -1009,7 +1088,7 @@ protected function callbackFilterPrice($collection, $column)
}
- if (Mage::helper('M2ePro/Component_Amazon')->isRepricingEnabled() && !empty($value['is_repricing'])) {
+ if (Mage::helper('M2ePro/Component_Amazon_Repricing')->isEnabled() && !empty($value['is_repricing'])) {
if (!empty($condition)) {
$condition = '(' . $condition . ') OR ';
}
diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Listing/Variation/Product/Manage/Tabs/Variations/Grid.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Listing/Variation/Product/Manage/Tabs/Variations/Grid.php
index 18974e4e4..1fb630cff 100644
--- a/app/code/community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Listing/Variation/Product/Manage/Tabs/Variations/Grid.php
+++ b/app/code/community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Listing/Variation/Product/Manage/Tabs/Variations/Grid.php
@@ -95,6 +95,15 @@ protected function _prepareCollection()
)
);
+ $collection->getSelect()->joinLeft(
+ array('malpr' => Mage::getResourceModel('M2ePro/Amazon_Listing_Product_Repricing')->getMainTable()),
+ '(`second_table`.`listing_product_id` = `malpr`.`listing_product_id`)',
+ array(
+ 'is_repricing' => 'listing_product_id',
+ 'is_repricing_disabled' => 'is_online_disabled',
+ )
+ );
+
// Set collection to grid
$this->setCollection($collection);
@@ -175,7 +184,7 @@ protected function _prepareColumns()
'filter_condition_callback' => array($this, 'callbackFilterQty')
));
- $this->addColumn('online_price', array(
+ $priceColumn = array(
'header' => Mage::helper('M2ePro')->__('Price'),
'align' => 'right',
'width' => '70px',
@@ -184,7 +193,13 @@ protected function _prepareColumns()
'filter_index' => 'online_price',
'frame_callback' => array($this, 'callbackColumnPrice'),
'filter_condition_callback' => array($this, 'callbackFilterPrice')
- ));
+ );
+
+ if (Mage::helper('M2ePro/Component_Amazon_Repricing')->isEnabled()) {
+ $priceColumn['filter'] = 'M2ePro/adminhtml_common_amazon_grid_column_filter_price';
+ }
+
+ $this->addColumn('online_price', $priceColumn);
$this->addColumn('status', array(
'header' => Mage::helper('M2ePro')->__('Status'),
@@ -543,8 +558,42 @@ public function callbackColumnPrice($value, $row, $column, $isExport)
return '' . Mage::helper('M2ePro')->__('Not Listed') . '';
}
+ $repricingHtml ='';
+
+ if (Mage::helper('M2ePro/Component_Amazon_Repricing')->isEnabled() &&
+ (bool)(int)$row->getData('is_repricing')) {
+
+ $image = 'money';
+ $text = Mage::helper('M2ePro')->__(
+ 'This Product is used by Amazon Repricing Tool, so its Price cannot be managed via M2E Pro. + Please note that the Price value(s) shown in the grid might + be different from the actual one from Amazon. It is caused by the delay + in the values updating made via the Repricing Service' + ); + + if ((int)$row->getData('is_repricing_disabled') == 1) { + $image = 'money_disabled'; + $text = Mage::helper('M2ePro')->__( + 'This product is disabled on Amazon Repricing Tool. + The Price is updated through the M2E Pro.' + ); + } + + $repricingHtml = << +
+
+
+HTML;
+ }
+
if (is_null($value) || $value === '') {
- return Mage::helper('M2ePro')->__('N/A');
+ return Mage::helper('M2ePro')->__('N/A') . $repricingHtml;
}
$marketplaceId = $this->getListingProduct()->getListing()->getMarketplaceId();
@@ -600,10 +649,11 @@ public function callbackColumnPrice($value, $row, $column, $isExport)
$currentTimestamp <= $endDateTimestamp &&
$salePrice < (float)$value
) {
- $resultHtml .= ''.$priceValue.'';
+ $resultHtml .= ''.$priceValue.'' .
+ $repricingHtml;
$resultHtml .= ''.$intervalHtml.' '.$salePriceValue; } else { - $resultHtml .= $priceValue; + $resultHtml .= $priceValue . $repricingHtml; $resultHtml .= '
'.$intervalHtml. ''.' '.$salePriceValue.''; } @@ -611,7 +661,7 @@ public function callbackColumnPrice($value, $row, $column, $isExport) } if (empty($resultHtml)) { - $resultHtml = $priceValue; + $resultHtml = $priceValue . $repricingHtml; } return $resultHtml; @@ -801,22 +851,58 @@ protected function callbackFilterPrice($collection, $column) return; } - $from = $value['from']; - $to = $value['to']; + $condition = ''; + + if (isset($value['from']) || isset($value['to'])) { - $collection->getSelect()->where( - '(online_price >= \''.$from.'\' AND online_price <= \''.$to.'\' AND + if (isset($value['from']) && $value['from'] != '') { + $condition = 'online_price >= \''.$value['from'].'\''; + } + if (isset($value['to']) && $value['to'] != '') { + if (isset($value['from']) && $value['from'] != '') { + $condition .= ' AND '; + } + $condition .= 'online_price <= \''.$value['to'].'\''; + } + + $condition = '(' . $condition . ' AND ( + (online_sale_price_start_date IS NULL AND + online_sale_price_end_date IS NULL) OR online_sale_price IS NULL OR - online_sale_price_start_date > NOW() OR - online_sale_price_end_date < NOW() - )) OR (online_sale_price >= \''.$from.'\' AND online_sale_price <= \''.$to.'\' AND + online_sale_price_start_date > CURRENT_DATE() OR + online_sale_price_end_date < CURRENT_DATE() + )) OR ('; + + if (isset($value['from']) && $value['from'] != '') { + $condition .= 'online_sale_price >= \''.$value['from'].'\''; + } + if (isset($value['to']) && $value['to'] != '') { + if (isset($value['from']) && $value['from'] != '') { + $condition .= ' AND '; + } + $condition .= 'online_sale_price <= \''.$value['to'].'\''; + } + + $condition .= ' AND ( + online_sale_price_start_date IS NOT NULL AND + online_sale_price_end_date IS NOT NULL AND online_sale_price IS NOT NULL AND - online_sale_price_start_date < NOW() AND - online_sale_price_end_date > NOW() - ))' - ); + online_sale_price_start_date < CURRENT_DATE() AND + online_sale_price_end_date > CURRENT_DATE() + ))'; + + } + + if (Mage::helper('M2ePro/Component_Amazon_Repricing')->isEnabled() && !empty($value['is_repricing'])) { + if (!empty($condition)) { + $condition = '(' . $condition . ') OR '; + } + $condition .= '`malpr`.`listing_product_id` IS NOT NULL'; + } + + $collection->getSelect()->where($condition); } //######################################## diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Listing/View.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Listing/View.php index 4b96454ab..bdf63a8d0 100644 --- a/app/code/community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Listing/View.php +++ b/app/code/community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Listing/View.php @@ -302,6 +302,9 @@ public function getGridHtml() $switchToMFN = $this->getUrl('*/adminhtml_common_amazon_listing/switchToMFN'); $getAFNQtyBySku = $this->getUrl('*/adminhtml_common_amazon_listing/getAFNQtyBySku'); + $getUpdatedRepricingPriceBySkus = $this->getUrl( + '*/adminhtml_common_amazon_listing_repricing/getUpdatedPriceBySkus' + ); $variationProductManage = $this->getUrl( '*/adminhtml_common_amazon_listing_variation_product_manage/index'); @@ -449,6 +452,7 @@ public function getGridHtml() M2ePro.url.switchToMFN = '{$switchToMFN}'; M2ePro.url.getAFNQtyBySku = '{$getAFNQtyBySku}'; + M2ePro.url.getUpdatedRepricingPriceBySkus = '{$getUpdatedRepricingPriceBySkus}'; M2ePro.url.variationProductManage = '{$variationProductManage}'; M2ePro.url.variationProductSetGeneralIdOwner = '{$variationProductSetGeneralIdOwner}'; diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Listing/View/Amazon/Grid.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Listing/View/Amazon/Grid.php index 34cd1f77f..fed0bc8bd 100644 --- a/app/code/community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Listing/View/Amazon/Grid.php +++ b/app/code/community/Ess/M2ePro/Block/Adminhtml/Common/Amazon/Listing/View/Amazon/Grid.php @@ -122,10 +122,10 @@ protected function _prepareCollection() )', 'online_sale_price_start_date' => 'online_sale_price_start_date', 'online_sale_price_end_date' => 'online_sale_price_end_date', + 'is_repricing' => 'is_repricing', 'is_afn_channel' => 'is_afn_channel', 'is_general_id_owner' => 'is_general_id_owner', 'is_variation_parent' => 'is_variation_parent', - 'is_repricing' => 'is_repricing', 'defected_messages' => 'defected_messages', 'min_online_price' => 'IF( (`t`.`variation_min_price` IS NULL), @@ -155,6 +155,14 @@ protected function _prepareCollection() '{{table}}.variation_parent_id is NULL' ); + $collection->getSelect()->joinLeft( + array('malpr' => Mage::getResourceModel('M2ePro/Amazon_Listing_Product_Repricing')->getMainTable()), + '(`alp`.`listing_product_id` = `malpr`.`listing_product_id`)', + array( + 'is_repricing_disabled' => 'is_online_disabled', + ) + ); + $collection->getSelect()->joinLeft( new Zend_Db_Expr('( SELECT @@ -276,7 +284,7 @@ protected function _prepareColumns() 'filter_condition_callback' => array($this, 'callbackFilterPrice') ); - if (Mage::helper('M2ePro/Component_Amazon')->isRepricingEnabled()) { + if (Mage::helper('M2ePro/Component_Amazon_Repricing')->isEnabled()) { $priceColumn['filter'] = 'M2ePro/adminhtml_common_amazon_grid_column_filter_price'; } @@ -775,33 +783,108 @@ public function callbackColumnPrice($value, $row, $column, $isExport) return '' . Mage::helper('M2ePro')->__('Not Listed') . ''; } + $listingProductId = (int)$row->getData('id'); + $repricingHtml =''; - if (Mage::helper('M2ePro/Component_Amazon')->isRepricingEnabled() && - (int)$row->getData('is_repricing') === Ess_M2ePro_Model_Amazon_Listing_Product::IS_REPRICING_YES) { + if (Mage::helper('M2ePro/Component_Amazon_Repricing')->isEnabled() && $row->getData('is_repricing')) { + if ($row->getData('is_variation_parent')) { + + $additionalData = (array)json_decode($row->getData('additional_data'), true); + + $enabledCount = isset($additionalData['repricing_enabled_count']) + ? $additionalData['repricing_enabled_count'] : null; + + $disabledCount = isset($additionalData['repricing_disabled_count']) + ? $additionalData['repricing_disabled_count'] : null; + + if ($enabledCount && $disabledCount) { + $image = 'money_mixed'; + $text = Mage::helper('M2ePro')->__( + 'This Parent has either Enabled and Disabled for dynamic repricing Child Products.
+ Please note that the Price value(s) shown in the grid might be + different from the actual one from Amazon. It is caused by the delay in the values + updating made via the Repricing Service.' + ); + } elseif ($enabledCount) { + $image = 'money'; + $text = Mage::helper('M2ePro')->__( + 'All Child Products of this Parent are Enabled for dynamic repricing.
+ Please note that the Price value(s) shown in the grid might be different + from the actual one from Amazon. It is caused by the delay in the values updating + made via the Repricing Service.' + ); + } elseif ($disabledCount) { + $image = 'money_disabled'; + $text = Mage::helper('M2ePro')->__('All Child Products of this Parent are Disabled for Repricing.'); + } else { + $image = 'money'; + $text = Mage::helper('M2ePro')->__( + 'Some Child Products of this Parent are managed by the Repricing Service.
+ Please note that the Price value(s) shown in the grid might be + different from the actual one from Amazon. It is caused by the delay in the + values updating made via the Repricing Service.' + ); + } + + $filter = base64_encode('online_price[is_repricing]=1'); + + $productTitle = Mage::helper('M2ePro')->escapeHtml($row->getData('name')); + $vpmt = Mage::helper('M2ePro')->__('Manage Variations of "%s" ', $productTitle); + $vpmt = addslashes($vpmt); + + $generalId = $row->getData('general_id'); + if (!empty($generalId)) { + $vpmt .= '('. $generalId .')'; + } + + $linkTitle = Mage::helper('M2ePro')->__('Show Child Products managed by Amazon Repricing Service.'); + + $repricingHtml = <<
; ?>)
+