1.3.0 (FINAL RELEASE)

m2epro · Sep 12, 2017 · 3a1f384 · 3a1f384
1 parent 18f5331
commit 3a1f384
Show file tree

Hide file tree

Showing 741 changed files with 34,495 additions and 15,285 deletions.
diff --git a/Block/Adminhtml/Amazon/Account/Edit/Tabs.php b/Block/Adminhtml/Amazon/Account/Edit/Tabs.php
@@ -16,6 +16,9 @@ protected function _construct()
 
     protected function _beforeToHtml()
     {
+        /** @var $account \Ess\M2ePro\Model\Account */
+        $account = $this->getHelper('Data\GlobalData')->getValue('edit_account');
+
         $this->addTab('general', array(
             'label'   => $this->__('General'),
             'title'   => $this->__('General'),
@@ -40,9 +43,23 @@ protected function _beforeToHtml()
             'content' => $this->createBlock('Amazon\Account\Edit\Tabs\ShippingSettings')->toHtml(),
         ));
 
-        if ($this->getHelper('Component\Amazon\Repricing')->isEnabled() &&
-            $this->getHelper('Data\GlobalData')->getValue('edit_account')) {
+        if (
+            !is_null($account)
+            && $account->getId()
+            && $account->getChildObject()->getMarketplace()->getChildObject()->isVatCalculationServiceAvailable()
+        ) {
+            $this->addTab('vat_calculation_service', array(
+                'label'   => $this->__('VAT Calculation Service'),
+                'title'   => $this->__('VAT Calculation Service'),
+                'content' => $this->createBlock('Amazon\Account\Edit\Tabs\VatCalculationService')->toHtml(),
+            ));
+        }
 
+        if (
+            !is_null($account)
+            && $account->getId()
+            && $this->getHelper('Component\Amazon\Repricing')->isEnabled()
+        ) {
             $this->addTab('repricing', array(
                 'label'   => $this->__('Repricing Tool'),
                 'title'   => $this->__('Repricing Tool'),

diff --git a/Block/Adminhtml/Amazon/Account/Edit/Tabs/Order.php b/Block/Adminhtml/Amazon/Account/Edit/Tabs/Order.php
@@ -138,12 +138,18 @@ protected function _prepareForm()
             self::HELP_BLOCK,
             [
                 'content' => $this->__(<<<HTML
-<p>Specify how M2E Pro should manage the imported from Amazon Orders for the Items listed using
-M2E Pro or other tools.</p><br>
-<p><strong>Note:</strong> If an Amazon Order is received, Magento Product QTY decreases only if a Magento
-Order is created.</p><br>
-<p>More detailed information about how to work with this Page you can find
-<a href="%url%" target="_blank" class="external-link">here</a>.</p>
+<p>Specify how M2E Pro should manage the Orders imported from Amazon.</p><br/>
+<p>You are able to configure the different rules of <strong>Magento Order Creation</strong> considering whether the
+Item was listed via M2E Pro or by some other software.</p><br/>
+<p>The <strong>Reserve Quantity</strong> feature will automatically work for imported Amazon Orders with Pending Status
+to hold the Stock until Magento Order is created or the reservation term is expired.</p><br/>
+<p>Moreover, you can provide the settings for <strong>Orders fulfilled by Amazon</strong>. Specify whether the
+corresponding Magento Order has to be created and or not. Additionally, you are able to reduce Magento Stock taking
+into account the FBA Orders.</p><br/>
+<p>Besides, you can set your preferences for the <strong>Refund & Cancellation, Tax, Customer, Order Number</strong>
+and <strong>Order Status Mapping</strong> Settings as well as specify the automatic creation of invoices and
+shipment notifications.</p><br/>
+<p>More detailed information you can find <a href="%url%" target="_blank" class="external-link">here</a>.</p>
 HTML
                     ,
                     $this->getHelper('Module\Support')->getDocumentationArticleUrl('x/NgItAQ')