@@ -3172,7 +3172,7 @@ class AdminProducts extends AdminTab
function displayFormAttributes($obj, $languages, $defaultLanguage)
{
-
+
$attributeJs = array();
$attributes = Attribute::getAttributes($this->context->language->id, true);
foreach ($attributes AS $k => $attribute)
@@ -3181,7 +3181,7 @@ class AdminProducts extends AdminTab
$attributes_groups = AttributeGroup::getAttributesGroups($this->context->language->id);
$default_country = new Country((int)Configuration::get('PS_COUNTRY_DEFAULT'));
-
+
$images = Image::getImages($this->context->language->id, $obj->id);
if ($obj->id)
{
@@ -3726,7 +3726,7 @@ class AdminProducts extends AdminTab
}
else if ($(\'#curPackItemId\').val() == \'\' || $(\'#curPackItemQty\').val() == \'\')
{
- alert(\''.$this->l('Thanks to set a quantity to add a product.').'\');
+ alert(\''.$this->l('Thanks to set a quantity to add a product.').'\');
return false;
}
diff --git a/admin-dev/tabs/AdminTaxRulesGroup.php b/admin-dev/tabs/AdminTaxRulesGroup.php
index 6342d81d5..33c874a47 100755
--- a/admin-dev/tabs/AdminTaxRulesGroup.php
+++ b/admin-dev/tabs/AdminTaxRulesGroup.php
@@ -25,543 +25,462 @@
* International Registered Trademark & Property of PrestaShop SA
*/
-
-class AdminTaxRulesGroup extends AdminTab
+class
+ AdminTaxRulesGroup extends AdminTab
{
+ public $tax_rule;
+ public $_errors_tax_rule;
+
public function __construct()
{
+ global $cookie;
$this->table = 'tax_rules_group';
$this->className = 'TaxRulesGroup';
$this->edit = true;
$this->delete = true;
+ $this->ajax = false;
$this->fieldsDisplay = array(
'id_tax_rules_group' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'name' => array('title' => $this->l('Name'), 'width' => 140),
'active' => array('title' => $this->l('Enabled'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false));
- parent::__construct();
+ parent::__construct();
}
- public function displayTop()
+ /**
+ * retrieve a tax rule via ajax
+ * @return tax rule in json format
+ */
+ public function ajaxProcessGetTaxRule()
{
- echo '
- '.$this->l('The tax rules allow you to define a product or a carrier with different taxes depending on their location (country, state, etc.).').'
+ $id_rule = (int)Tools::getValue('id_tax_rule');
- '.$this->l('In the majority of cases, the rules created by default by PrestaShop should be enough.').' '.
- $this->l('If, however, you need to change them, here is an example that will help you understand how it works:').
- '
'
- .$this->l('You want to apply a tax of 19.6% to a product in France and Europe, but not apply this tax to other countries. Follow these steps:').'
-
-
'.$this->l('Click "Add New".').'
-
'.$this->l('Give a name to your tax rule (ex: "19.6% tax rule).').'
-
'.$this->l('Set the \'active\' field to true.').'
-
'.$this->l('Edit its configuration by country by associating a 19.6% tax with France and with European countries, and a tax of 0% to other countries.').'
-
'.$this->l('Click on Save.').'
-
'.$this->l('Go to your product page (Catalog tab) and associate the "19.6% tax rule" to your product.').'
-
-
- '.$this->l('Later, if you need to apply a different tax to Spain, you can simply edit the rule "19.6% tax rule" and change the tax associated with Spain.').'
- '.$this->l('Note: The default rate applied to your product will be based on your store\'s default country.').'
-
.')
@@ -3172,7 +3172,7 @@ class AdminProducts extends AdminTab
function displayFormAttributes($obj, $languages, $defaultLanguage)
{
-
+
$attributeJs = array();
$attributes = Attribute::getAttributes($this->context->language->id, true);
foreach ($attributes AS $k => $attribute)
@@ -3181,7 +3181,7 @@ class AdminProducts extends AdminTab
$attributes_groups = AttributeGroup::getAttributesGroups($this->context->language->id);
$default_country = new Country((int)Configuration::get('PS_COUNTRY_DEFAULT'));
-
+
$images = Image::getImages($this->context->language->id, $obj->id);
if ($obj->id)
{
@@ -3726,7 +3726,7 @@ class AdminProducts extends AdminTab
}
else if ($(\'#curPackItemId\').val() == \'\' || $(\'#curPackItemQty\').val() == \'\')
{
- alert(\''.$this->l('Thanks to set a quantity to add a product.').'\');
+ alert(\''.$this->l('Thanks to set a quantity to add a product.').'\');
return false;
}
diff --git a/admin-dev/tabs/AdminTaxRulesGroup.php b/admin-dev/tabs/AdminTaxRulesGroup.php
index 6342d81d5..33c874a47 100755
--- a/admin-dev/tabs/AdminTaxRulesGroup.php
+++ b/admin-dev/tabs/AdminTaxRulesGroup.php
@@ -25,543 +25,462 @@
* International Registered Trademark & Property of PrestaShop SA
*/
-
-class AdminTaxRulesGroup extends AdminTab
+class
+ AdminTaxRulesGroup extends AdminTab
{
+ public $tax_rule;
+ public $_errors_tax_rule;
+
public function __construct()
{
+ global $cookie;
$this->table = 'tax_rules_group';
$this->className = 'TaxRulesGroup';
$this->edit = true;
$this->delete = true;
+ $this->ajax = false;
$this->fieldsDisplay = array(
'id_tax_rules_group' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'name' => array('title' => $this->l('Name'), 'width' => 140),
'active' => array('title' => $this->l('Enabled'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false));
- parent::__construct();
+ parent::__construct();
}
- public function displayTop()
+ /**
+ * retrieve a tax rule via ajax
+ * @return tax rule in json format
+ */
+ public function ajaxProcessGetTaxRule()
{
- echo '
';
+ if (count($this->_errors_tax_rule) == 1)
+ echo $this->_errors_tax_rule[0];
+ else
+ {
+ echo $nbErrors.' '.$this->l('errors').'