- | {l s='Status:' } |
+ |
active}checked="checked" {/if} />
|
{/if}
active}style="display:none"{/if} >
- | {l s='Options:' } |
+ |
available_for_order}checked="checked"{/if} />
+
+
+
+
+  {l s='Create'}
+
+
+ {if $tax_exclude_taxe_option}
+ {l s='Taxes are currently disabled'} ({l s='Tax options'})
+
+ {/if}
+ |
+
+ {if $ps_use_ecotax}
+
+ |
+
+ {$currency->prefix}{$currency->suffix}
+ ({l s='already included in price'})
+ |
+
+ {/if}
+
+ |
+
+ {$currency->prefix}{$currency->suffix}
+ |
+
+
+ |
+
+ {$currency->prefix} {$currency->suffix}
+ {l s='per'}
+ {if $ps_tax && $country_display_tax_label}
+ {l s='or'}
+ {$currency->prefix}0.00{$currency->suffix}
+ {l s='per'} {$product->unity} {l s='with tax'}
+
+ {/if}
+ {l s='Eg. $15 per Lb'}
+ |
+
+
+ |
+
+ on_sale}checked="checked"{/if} value="1" />
+ |
+
+
+ |
+
+
+ {$currency->prefix}{$currency->suffix} ({l s='tax incl.'})
+
+
+
+ {if $country_display_tax_label}
+ /
+ {/if}
+ {$currency->prefix}{$currency->suffix} {if $country_display_tax_label}({l s='tax excl.'}){/if}
+ |
+
+
+ |
+
+ {l s='You can define many discounts and specific price rules in the Prices tab'}
+ |
+
+ {* [end] prices *}
+
{$content}
diff --git a/classes/AdminController.php b/classes/AdminController.php
index f79783f28..62e701799 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -92,7 +92,7 @@ class AdminControllerCore extends Controller
protected $_list = array();
/** @var array Cache for query results */
- protected $toolbar_btn = array();
+ protected $toolbar_btn = null;
/** @var integer Number of results in list */
protected $_listTotal = 0;
@@ -712,7 +712,8 @@ class AdminControllerCore extends Controller
}
/**
- * assign $this->toolbar_btn in smarty
+ * assign default action in toolbar_btn smarty var, if they are not set.
+ * uses override to specifically add, modify or remove items
*
*/
public function initToolbar()
@@ -982,7 +983,7 @@ class AdminControllerCore extends Controller
'lang_iso' => $this->context->language->iso_code,
'link' => $this->context->link,
'bo_color' => isset($this->context->employee->bo_color) ? Tools::htmlentitiesUTF8($this->context->employee->bo_color) : null,
- 'shop_name' => Configuration::get('PS_SHOP_NAME'),
+ 'shop_name' => $shop_name,
'show_new_orders' => Configuration::get('PS_SHOW_NEW_ORDERS'),
'show_new_customers' => Configuration::get('PS_SHOW_NEW_CUSTOMERS'),
'show_new_messages' => Configuration::get('PS_SHOW_NEW_MESSAGES'),
@@ -1043,6 +1044,8 @@ class AdminControllerCore extends Controller
*/
public function initContent()
{
+ // toolbar (save, cancel, new, ..)
+ $this->initToolbar();
if ($this->display == 'edit' || $this->display == 'add')
{
if (!($this->object = $this->loadObject(true)))
@@ -1055,9 +1058,6 @@ class AdminControllerCore extends Controller
$this->content .= $this->initOptions();
}
- // toolbar (save, cancel, new, ..)
- $this->initToolbar();
-
$this->context->smarty->assign(array(
'table' => $this->table,
'current' => self::$currentIndex,
@@ -1160,6 +1160,7 @@ class AdminControllerCore extends Controller
$helper->default_form_language = $this->default_form_language;
$helper->allow_employee_form_lang = $this->allow_employee_form_lang;
$helper->fields_value = $this->getFieldsValue($this->object);
+ $helper->toolbar_btn = $this->toolbar_btn;
if ($this->tabAccess['view'])
{
if (Tools::getValue('back'))
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index c9d5f8a6d..b8fd5990b 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -1703,6 +1703,55 @@ if (false)
$this->context->smarty->assign('draft_warning',$content);
}
+ public function initToolbar()
+ {
+ if ($this->display == 'edit')
+ if ($product = $this->loadObject(true))
+ {
+ if($this->tabAccess['delete'])
+ $this->toolbar_btn['delete'] = array(
+ 'short' => 'Delete',
+ 'href' => $this->context->link->getAdminLink('AdminProducts').'&id_product='.$product->id.'&deleteproduct',
+ 'desc' => $this->l('Delete this product'),
+ 'confirm' => 1);
+
+ if($this->tabAccess['add'])
+ $this->toolbar_btn['duplicate'] = array(
+ 'short' => 'Duplicate',
+ 'href' => '#todo'.$this->context->link->getAdminLink('AdminProducts').'&id_product='.$product->id, 'desc' => $this->l('Duplicate'),
+ 'confirm' => 1
+ );
+ // @TODO navigation
+ $this->toolbar_btn['preview'] = array(
+ 'short' => 'Preview',
+ 'href' => '', 'desc' => 'prevdesc',
+ 'class' => 'previewUrl',
+ );
+ if (file_exists(_PS_MODULE_DIR_.'statsproduct/statsproduct.php'))
+ $this->toolbar_btn['stats'] = array(
+ 'short' => 'Statistics',
+ 'href' => $this->context->link->getAdminLink('AdminStats').'&module=statsproduct&id_product='.$product->id,
+ 'desc' => $this->l('View product sales'),
+ );
+
+ $this->toolbar_btn['cancel'] = array(
+ 'short' => 'Close',
+ 'href' => '#todo'.$this->context->link->getAdminLink('AdminProducts').'&id_product='.$product->id, 'desc' => $this->l('Cancel'),
+ 'confirm' => 1);
+ if($this->tabAccess['add'])
+ $this->toolbar_btn['new'] = array(
+ 'short' => 'Create',
+ 'href' => '#todo'.$this->context->link->getAdminLink('AdminProducts').'&id_product='.$product->id, 'desc' => $this->l('Create'),
+ );
+ if($this->tabAccess['edit'])
+ $this->toolbar_btn['save'] = array(
+ 'short' => 'Save',
+ 'href' => '#todo'.$this->context->link->getAdminLink('AdminProducts').'&id_product='.$product->id, 'desc' => $this->l('Save'),
+ );
+ }
+ return parent::initToolbar();
+ }
+
/**
* initForm contains all necessary initialization needed for all tabs
*
@@ -1722,8 +1771,9 @@ if (false)
$this->context->smarty->assign('upload_max_filesize', ini_get('upload_max_filesize'));
$this->context->smarty->assign('country_display_tax_label', $this->context->country->display_tax_label);
+ // let's calculate this once for all
if (!($obj = $this->loadObject(true)))
- throw new Exception('object not loaded');
+ throw new PrestashopException('object not loaded');
$this->_displayDraftWarning($obj->active);
return parent::initForm();
}
@@ -1734,7 +1784,7 @@ if (false)
parent::displayForm();
$this->addJs(_PS_JS_DIR_.'attributesBack.js');
if (!($product = $this->loadObject(true)))
- throw new Exception('object not loaded');
+ throw new PrestashopException('object not loaded');
$smarty = $this->context->smarty;
$product_tabs = array();
// action defines which tab to display first
@@ -1860,7 +1910,7 @@ switch ($this->action)
}
}
- function initFormPrices($obj, $languages, $defaultLanguage)
+ public function initFormPrices($obj, $languages, $defaultLanguage)
{
$content = '';
if ($obj->id)
@@ -2325,6 +2375,15 @@ switch ($this->action)
// customization
'uploadable_files', 'text_fields'
);
+ // prices
+ array_push($product_props,
+ 'price', 'wholesale_price', 'id_tax_rules_group', 'unit_price_ratio', 'on_sale',
+ 'unity'
+ );
+
+ if(Configuration::get('PS_USE_ECOTAX'))
+ array_push($product_props, 'ecotax');
+
foreach($product_props as $prop)
$product->$prop = $this->getFieldValue($product, $prop);
$product->manufacturer_name = Manufacturer::getNameById($product->id_manufacturer);
@@ -2402,121 +2461,20 @@ $product->supplier_name = Supplier::getNameById($product->id_supplier);
$smarty->assign('error_product_download', $error);
}
- $currency = $this->context->currency;
- $content .= '
-
- |
-
- '.($currency->format % 2 != 0 ? $currency->sign.' ' : '').''.($currency->format % 2 == 0 ? ' '.$currency->sign : '').'
- '.$this->l('The wholesale price at which you bought this product').'
- |
-
';
- $content .= '
-
- |
-
- '.($currency->format % 2 != 0 ? $currency->sign.' ' : '').''.($currency->format % 2 == 0 ? ' '.$currency->sign : '').' *
- '.$this->l('The pre-tax retail price to sell this product').'
- |
-
';
- $tax_rules_groups = TaxRulesGroup::getTaxRulesGroups(true);
- $taxesRatesByGroup = TaxRulesGroup::getAssociatedTaxRatesByIdCountry($this->context->country->id);
- $ecotaxTaxRate = Tax::getProductEcotaxRate();
- $content .= '';
- $content .= '
-
- |
-
-
-
-
- '.$this->l('Create').'
- ';
- if (Tax::excludeTaxeOption())
- {
- $content .= ''.$this->l('Taxes are currently disabled').' ('.$this->l('Tax options').')';
- $content .= '';
- }
-
- $content .= ' |
-
- ';
- if (Configuration::get('PS_USE_ECOTAX'))
- $content .= '
-
- |
-
- '.($currency->format % 2 != 0 ? $currency->sign.' ' : '').''.($currency->format % 2 == 0 ? ' '.$currency->sign : '').'
- ('.$this->l('already included in price').')
- |
-
';
-
- if ($this->context->country->display_tax_label)
- {
- $content .= '
-
- |
-
- '.($currency->format % 2 != 0 ? ' '.$currency->sign : '').' '.($currency->format % 2 == 0 ? ' '.$currency->sign : '').'
- |
-
';
- }
- else
- $content .= '';
-
- $content .= '
-
- |
-
- '.($currency->format % 2 != 0 ? ' '.$currency->sign : '').' '.($currency->format % 2 == 0 ? ' '.$currency->sign : '').' '.$this->l('per').' '.
- (Configuration::get('PS_TAX') && $this->context->country->display_tax_label ? ''.$this->l('or').' '.($currency->format % 2 != 0 ? ' '.$currency->sign : '').'0.00'.($currency->format % 2 == 0 ? ' '.$currency->sign : '').' '.$this->l('per').' '.$this->getFieldValue($product, 'unity').' '.$this->l('with tax') : '').'
- '.$this->l('Eg. $15 per Lb').'
- |
-
-
- |
-
- getFieldValue($product, 'on_sale') ? 'checked="checked"' : '').'value="1" />
- |
-
-
- |
-
-
- '.($currency->format % 2 != 0 ? $currency->sign.' ' : '').''.($currency->format % 2 == 0 ? ' '.$currency->sign : '').' ('.$this->l('tax incl.').')
-
- ';
-
- if ($this->context->country->display_tax_label)
- $content .= ' / ';
-
- $content .= ($currency->format % 2 != 0 ? $currency->sign.' ' : '').''.($currency->format % 2 == 0 ? ' '.$currency->sign : '').' '.($this->context->country->display_tax_label ? '('.$this->l('tax excl.').')' : '').'
- |
-
-
- |
-
- '.$this->l('You can define many discounts and specific price rules in the Prices tab').'
- |
-
';
+ $smarty->assign('ps_tax', Configuration::get('PS_TAX'));
if ((int)Configuration::get('PS_STOCK_MANAGEMENT'))
@@ -2756,7 +2714,7 @@ $product->supplier_name = Supplier::getNameById($product->id_supplier);
{
$content .= '
- |
+ |
'.$this->l('Do you want an image associated with the product in your description?').'
diff --git a/css/admin.css b/css/admin.css
index 7bfe16cc9..900a1412c 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -68,11 +68,11 @@ hr {
}
legend, th {
- font-family : Trebuchet,Arial,Helvetica,sans-serif;
+ font-family : Arial,Helvetica,sans-serif;
}
h1, h2, h3, h4, h5, h6 {
- font-family : "Trebuchet MS",Trebuchet,Arial,Helvetica,sans-serif;
+ font-family : Arial,Helvetica,sans-serif;
}
h1 {
@@ -327,7 +327,6 @@ select optgroup option {
/* STRUCTURE */
#container {
- width: 1024px;
margin: 0 auto 2em auto;
text-align: left;
}
|
{l s='Back to list'}