Skip to content

Commit

Permalink
Merge pull request PrestaShop#1196 from xBorderie/patch-3
Browse files Browse the repository at this point in the history 
[*] BO: updating option descriptions for AdminReferrers.
  • Loading branch information
Jérôme Nadaud committed Jan 2, 2014
2 parents 177a5cf + 5358449 commit 5ac1a1f
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 64 deletions.
6 changes: 3 additions & 3 deletions admin-dev/themes/default/template/controllers/referrers/form_settings.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<h3>
<i class="icon-fullscreen"></i> {l s='Indexation'}
</h3>
<div class="alert alert-info">{l s='There is a huge quantity of data, so each connection corresponding to a referrer is indexed. You can also refresh this index by clicking the button above. This process may take awhile, and it\'s only needed if you modified or added a referrer, or if you want changes to be retroactive.'}</div>
<div class="alert alert-info">{l s='There is a huge quantity of data, so each connection corresponding to a referrer is indexed. You can also refresh this index by clicking the "Refresh index" button. This process may take a while, and it\'s only needed if you modified or added a referrer, or if you want changes to be retroactive.'}</div>
<button type="submit" class="btn btn-default" name="submitRefreshIndex" id="submitRefreshIndex">
<i class="icon-refresh"></i> {l s='Refresh index'}
</button>
Expand All @@ -80,7 +80,7 @@
<h3>
<i class="icon-briefcase"></i> {l s='Cache'}
</h3>
<div class="alert alert-info">{l s='In order to sort and filter your data, it\'s cached. You can refresh the cache by clicking on the button above.'}</div>
<div class="alert alert-info">{l s='Your data is cached in order to sort it and filter it. You can refresh the cache by clicking on the "Refresh cache" button.'}</div>
<button type="submit" class="btn btn-default" name="submitRefreshCache" id="submitRefreshCache">
<i class="icon-refresh"></i> {l s='Refresh cache'}
</button>
Expand All @@ -90,4 +90,4 @@
</div>




2 changes: 1 addition & 1 deletion controllers/admin/AdminStockCoverController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public function renderList()
);

$this->displayInformation($this->l('Considering the coverage period chosen and the quantity of products/combinations that you sold.'));
$this->displayInformation($this->l('this interface gives you an idea of when a product will run out of stock.'));
$this->displayInformation($this->l('This interface gives you an idea of when a product will run out of stock.'));

return parent::renderList();
}
Expand Down
75 changes: 37 additions & 38 deletions controllers/admin/AdminStockManagementController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,7 @@ public function renderList()
$this->displayInformation($this->l('Furthermore, you can alter product quantities between warehouses, or within one warehouse.').'<br />');
$this->displayInformation($this->l('If you want to increase quantities of multiple products at once, you can use the "Supply orders" page under the "Stock" menu.').'<br />');
$this->displayInformation($this->l('Finally, you need to provide the quantity that you\'ll be adding:'));
$this->displayInformation($this->l('Usable for sale means that this quantity will be available in your shop(s),'));
$this->displayInformation($this->l('otherwise it will be considered reserved (i.e. for other purposes).'));
$this->displayInformation($this->l('"Usable for sale" means that this quantity will be available in your shop(s), otherwise it will be considered reserved (i.e. for other purposes).'));

return parent::renderList();
}
Expand Down Expand Up @@ -198,37 +197,37 @@ public function renderForm()
),
array(
'type' => 'text',
'label' => $this->l('Product reference:'),
'label' => $this->l('Product reference'),
'name' => 'reference',
'disabled' => true,
),
array(
'type' => 'text',
'label' => $this->l('EAN13:'),
'label' => $this->l('EAN13'),
'name' => 'ean13',
'disabled' => true,
),
array(
'type' => 'text',
'label' => $this->l('UPC:'),
'label' => $this->l('UPC'),
'name' => 'upc',
'disabled' => true,
),
array(
'type' => 'text',
'label' => $this->l('Name:'),
'label' => $this->l('Name'),
'name' => 'name',
'disabled' => true,
),
array(
'type' => 'text',
'label' => $this->l('Quantity to add:'),
'label' => $this->l('Quantity to add'),
'name' => 'quantity',
'maxlength' => 6,
'required' => true,
'hint' => array(
$this->l('Physical quantity to add'),
$this->l('Last physical quantity added : %s (%s)'),
$this->l('Indicate the physical quantity of this product that you want to add.'),
$this->l('Last physical quantity added: %s (%s).'),
($last_sm_quantity > 0 ? $last_sm_quantity : $this->l('N/A')),
($last_sm_quantity > 0 ? ($last_sm_quantity_is_usable >= 0 ? $this->l('Usable') : $this->l('Not usable')) : $this->l('N/A'))),
),
Expand All @@ -254,7 +253,7 @@ public function renderForm()
),
array(
'type' => 'select',
'label' => $this->l('Warehouse:'),
'label' => $this->l('Warehouse'),
'name' => 'id_warehouse',
'required' => true,
'options' => array(
Expand All @@ -272,13 +271,13 @@ public function renderForm()
'size' => 10,
'maxlength' => 10,
'hint' => array(
$this->l('Unit purchase price or unit manufacturing cost for this product (tax excl.)'),
sprintf($this->l('Last unit price (tax excl.): %s'), $last_sm_unit_price_te),
$this->l('Unit purchase price or unit manufacturing cost for this product (tax excl.).'),
sprintf($this->l('Last unit price (tax excl.): %s.'), $last_sm_unit_price_te),
)
),
array(
'type' => 'select',
'label' => $this->l('Currency:'),
'label' => $this->l('Currency'),
'name' => 'id_currency',
'required' => true,
'options' => array(
Expand All @@ -290,7 +289,7 @@ public function renderForm()
),
array(
'type' => 'select',
'label' => $this->l('Label:'),
'label' => $this->l('Label'),
'name' => 'id_stock_mvt_reason',
'required' => true,
'options' => array(
Expand All @@ -300,7 +299,7 @@ public function renderForm()
'id' => 'id_stock_mvt_reason',
'name' => 'name'
),
'hint' => $this->l('Label used in stock movements'),
'hint' => $this->l('Label used in stock movements.'),
),
),
'submit' => array(
Expand Down Expand Up @@ -335,33 +334,33 @@ public function renderForm()
),
array(
'type' => 'text',
'label' => $this->l('Product reference:'),
'label' => $this->l('Product reference'),
'name' => 'reference',
'disabled' => true,
),
array(
'type' => 'text',
'label' => $this->l('EAN13:'),
'label' => $this->l('EAN13'),
'name' => 'ean13',
'disabled' => true,
),
array(
'type' => 'text',
'label' => $this->l('Name:'),
'label' => $this->l('Name'),
'name' => 'name',
'disabled' => true,
),
array(
'type' => 'text',
'label' => $this->l('Quantity to remove:'),
'label' => $this->l('Quantity to remove'),
'name' => 'quantity',
'maxlength' => 6,
'required' => true,
'hint' => $this->l('Physical quantity to remove'),
'hint' => $this->l('Indicate the physical quantity of this product that you want to remove.'),
),
array(
'type' => 'switch',
'label' => $this->l('Usable for sale:'),
'label' => $this->l('Usable for sale'),
'name' => 'usable',
'required' => true,
'is_bool' => true,
Expand All @@ -381,7 +380,7 @@ public function renderForm()
),
array(
'type' => 'select',
'label' => $this->l('Warehouse:'),
'label' => $this->l('Warehouse'),
'name' => 'id_warehouse',
'required' => true,
'options' => array(
Expand All @@ -393,7 +392,7 @@ public function renderForm()
),
array(
'type' => 'select',
'label' => $this->l('Label:'),
'label' => $this->l('Label'),
'name' => 'id_stock_mvt_reason',
'required' => true,
'options' => array(
Expand All @@ -403,7 +402,7 @@ public function renderForm()
'id' => 'id_stock_mvt_reason',
'name' => 'name'
),
'hint' => $this->l('Label used in stock movements'),
'hint' => $this->l('Label used in stock movements.'),
),
),
'submit' => array(
Expand Down Expand Up @@ -437,33 +436,33 @@ public function renderForm()
),
array(
'type' => 'text',
'label' => $this->l('Product reference:'),
'label' => $this->l('Product reference'),
'name' => 'reference',
'disabled' => true,
),
array(
'type' => 'text',
'label' => $this->l('EAN13:'),
'label' => $this->l('EAN13'),
'name' => 'ean13',
'disabled' => true,
),
array(
'type' => 'text',
'label' => $this->l('Name:'),
'label' => $this->l('Name'),
'name' => 'name',
'disabled' => true,
),
array(
'type' => 'text',
'label' => $this->l('Quantity to transfer:'),
'label' => $this->l('Quantity to transfer'),
'name' => 'quantity',
'maxlength' => 6,
'required' => true,
'hint' => $this->l('Quantity to transfer:')
'hint' => $this->l('Indicate the physical quantity of this product that you want to transfer.')
),
array(
'type' => 'select',
'label' => $this->l('Source Warehouse:'),
'label' => $this->l('Source warehouse'),
'name' => 'id_warehouse_from',
'required' => true,
'options' => array(
Expand All @@ -475,27 +474,27 @@ public function renderForm()
),
array(
'type' => 'switch',
'label' => $this->l('Is this product usable in your source warehouse?'),
'label' => $this->l('Is this product usable for sale in your source warehouse?'),
'name' => 'usable_from',
'required' => true,
'is_bool' => true,
'values' => array(
array(
'id' => 'active_on',
'value' => 1,
'label' => $this->l('Enabled')
'label' => $this->l('Yes')
),
array(
'id' => 'active_off',
'value' => 0,
'label' => $this->l('Disabled')
'label' => $this->l('No')
)
),
'hint' => $this->l('Is this the usable quantity for sale?')
),
array(
'type' => 'select',
'label' => $this->l('Destination warehouse:'),
'label' => $this->l('Destination warehouse'),
'name' => 'id_warehouse_to',
'required' => true,
'options' => array(
Expand All @@ -507,7 +506,7 @@ public function renderForm()
),
array(
'type' => 'switch',
'label' => $this->l('Is this product for sale in your destination warehouse?'),
'label' => $this->l('Is this product usable for sale in your destination warehouse?'),
'name' => 'usable_to',
'required' => true,
'class' => 't',
Expand All @@ -516,15 +515,15 @@ public function renderForm()
array(
'id' => 'active_on',
'value' => 1,
'label' => $this->l('Enabled')
'label' => $this->l('Yes')
),
array(
'id' => 'active_off',
'value' => 0,
'label' => $this->l('Disabled')
'label' => $this->l('No')
)
),
'hint' => $this->l('Do you want it to be for sale/useable?')
'hint' => $this->l('Do you want it to be for sale/usable?')
),
),
'submit' => array(
Expand Down
Loading

0 comments on commit 5ac1a1f

Please sign in to comment.