From 010f96175b1937728c5b3928eeea86e174eda66d Mon Sep 17 00:00:00 2001 From: lLefevre Date: Wed, 4 Jan 2012 09:43:09 +0000 Subject: [PATCH] [-] BO : fix #PSTEST-134 --- .../default/template/helper/list/list_content.tpl | 6 ++++-- cache/class_index.php | 15 +++++++++------ classes/AdminController.php | 2 +- controllers/admin/AdminGroupsController.php | 10 ++++++---- controllers/admin/AdminOrdersController.php | 1 + translations/fr/admin.php | 5 ++++- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/admin-dev/themes/default/template/helper/list/list_content.tpl b/admin-dev/themes/default/template/helper/list/list_content.tpl index 55364410c..185ee85df 100644 --- a/admin-dev/themes/default/template/helper/list/list_content.tpl +++ b/admin-dev/themes/default/template/helper/list/list_content.tpl @@ -89,8 +89,10 @@ {$tr.$key} {elseif isset($params.type) && $params.type == 'datetime'} {$tr.$key} - {elseif isset($params.type) && $params.type == 'decimal'} - {$tr.$key|string_format:"%.2f"} + {elseif isset($params.type) && $params.type == 'decimal'} + {$tr.$key|string_format:"%.2f"} + {elseif isset($params.type) && $params.type == 'percent'} + {$tr.$key} {l s='%'} {* If type is 'editable', an input is created *} {elseif isset($params.type) && $params.type == 'editable' && isset($tr.id)} diff --git a/cache/class_index.php b/cache/class_index.php index 7fefd49a9..b935dcdef 100644 --- a/cache/class_index.php +++ b/cache/class_index.php @@ -181,7 +181,7 @@ 'RijndaelCore' => 'classes/Rijndael.php', 'Rijndael' => 'override/classes/Rijndael.php', 'RiskCore' => 'classes/Risk.php', - 'Risk' => '', + 'Risk' => 'override/classes/Risk.php', 'SceneCore' => 'classes/Scene.php', 'Scene' => 'override/classes/Scene.php', 'SearchCore' => 'classes/Search.php', @@ -191,7 +191,7 @@ 'SpecificPriceCore' => 'classes/SpecificPrice.php', 'SpecificPrice' => 'override/classes/SpecificPrice.php', 'SpecificPriceRuleCore' => 'classes/SpecificPriceRule.php', - 'SpecificPriceRule' => '', + 'SpecificPriceRule' => 'override/classes/SpecificPriceRule.php', 'StateCore' => 'classes/State.php', 'State' => 'override/classes/State.php', 'StoreCore' => 'classes/Store.php', @@ -257,7 +257,7 @@ 'OrderCore' => 'classes/order/Order.php', 'Order' => 'override/classes/order/Order.php', 'OrderCarrierCore' => 'classes/order/OrderCarrier.php', - 'OrderCarrier' => '', + 'OrderCarrier' => 'override/classes/order/OrderCarrier.php', 'OrderCartRuleCore' => 'classes/order/OrderCartRule.php', 'OrderCartRule' => 'override/classes/order/OrderCartRule.php', 'OrderDetailCore' => 'classes/order/OrderDetail.php', @@ -317,7 +317,8 @@ 'StockMvt' => 'override/classes/stock/StockMvt.php', 'StockMvtReasonCore' => 'classes/stock/StockMvtReason.php', 'StockMvtReason' => 'override/classes/stock/StockMvtReason.php', - 'StockMvtWS' => 'classes/stock/StockMvtWS.php', + 'StockMvtWSCore' => 'classes/stock/StockMvtWS.php', + 'StockMvtWS' => 'override/classes/stock/StockMvtWS.php', 'SupplyOrderCore' => 'classes/stock/SupplyOrder.php', 'SupplyOrder' => 'override/classes/stock/SupplyOrder.php', 'SupplyOrderDetailCore' => 'classes/stock/SupplyOrderDetail.php', @@ -466,7 +467,8 @@ 'AdminOrderMessageController' => 'override/controllers/admin/AdminOrderMessageController.php', 'AdminOrdersControllerCore' => 'controllers/admin/AdminOrdersController.php', 'AdminOrdersController' => 'override/controllers/admin/AdminOrdersController.php', - 'AdminOutstandingController' => 'controllers/admin/AdminOutstandingController.php', + 'AdminOutstandingControllerCore' => 'controllers/admin/AdminOutstandingController.php', + 'AdminOutstandingController' => 'override/controllers/admin/AdminOutstandingController.php', 'AdminPPreferencesControllerCore' => 'controllers/admin/AdminPPreferencesController.php', 'AdminPPreferencesController' => 'override/controllers/admin/AdminPPreferencesController.php', 'AdminPaymentControllerCore' => 'controllers/admin/AdminPaymentController.php', @@ -509,7 +511,8 @@ 'AdminShopUrlController' => 'override/controllers/admin/AdminShopUrlController.php', 'AdminSlipControllerCore' => 'controllers/admin/AdminSlipController.php', 'AdminSlipController' => 'override/controllers/admin/AdminSlipController.php', - 'AdminSpecificPriceRuleController' => 'controllers/admin/AdminSpecificPriceRuleController.php', + 'AdminSpecificPriceRuleControllerCore' => 'controllers/admin/AdminSpecificPriceRuleController.php', + 'AdminSpecificPriceRuleController' => 'override/controllers/admin/AdminSpecificPriceRuleController.php', 'AdminStatesControllerCore' => 'controllers/admin/AdminStatesController.php', 'AdminStatesController' => 'override/controllers/admin/AdminStatesController.php', 'AdminStatsControllerCore' => 'controllers/admin/AdminStatsController.php', diff --git a/classes/AdminController.php b/classes/AdminController.php index 0af52d5a1..256a31685 100644 --- a/classes/AdminController.php +++ b/classes/AdminController.php @@ -2099,7 +2099,7 @@ class AdminControllerCore extends Controller foreach ($this->fields_form as $fieldset) if (isset($fieldset['form']['input'])) foreach ($fieldset['form']['input'] as $input) - if (empty($this->fields_value[$input['name']])) + if (!isset($this->fields_value[$input['name']])) if (isset($input['type']) && ($input['type'] == 'group_shop' || $input['type'] == 'shop')) { if ($obj->id) diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php index 0d9cab6f2..3417f185b 100644 --- a/controllers/admin/AdminGroupsController.php +++ b/controllers/admin/AdminGroupsController.php @@ -63,8 +63,8 @@ class AdminGroupsControllerCore extends AdminController 'reduction' => array( 'title' => $this->l('Discount'), 'width' => 50, - 'align' => - 'right' + 'align' => 'right', + 'type' => 'percent' ), 'nb' => array( 'title' => $this->l('Members'), @@ -184,7 +184,7 @@ class AdminGroupsControllerCore extends AdminController ), array( 'type' => 'text', - 'label' => $this->l('Discount:'), + 'label' => $this->l('Discount (%):'), 'name' => 'reduction', 'size' => 33, 'desc' => $this->l('Will automatically apply this value as a discount on ALL shop\'s products for this group\'s members.') @@ -246,6 +246,8 @@ class AdminGroupsControllerCore extends AdminController ) ); + $this->fields_value['reduction'] = isset($group->reduction) ? $group->reduction : 0; + $trads = array( 'Home' => $this->l('Home'), 'selected' => $this->l('selected'), @@ -255,10 +257,10 @@ class AdminGroupsControllerCore extends AdminController 'Uncheck All' => $this->l('Uncheck All'), 'search' => $this->l('Search a category') ); + $this->tpl_form_vars['categoryTreeView'] = Helper::renderAdminCategorieTree($trads, array(), 'id_category', true, false, array(), true); return parent::renderForm(); - } protected function formatCategoryDiscountList($id) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index c340f5cbc..fc177b0f3 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -99,6 +99,7 @@ class AdminOrdersControllerCore extends AdminController 'order_states' => OrderState::getOrderStates((int)Context::getContext()->cookie->id_lang), 'show_toolbar' => $this->show_toolbar, 'toolbar_btn' => $this->toolbar_btn, + 'toolbar_fix' => $this->toolbar_fix, 'title' => $this->l('Orders : create order'), )); $this->content .= $this->context->smarty->fetch('orders/form.tpl'); diff --git a/translations/fr/admin.php b/translations/fr/admin.php index b5846832f..7fd74cc40 100644 --- a/translations/fr/admin.php +++ b/translations/fr/admin.php @@ -1559,6 +1559,7 @@ $_LANGADM['Helper00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé'; $_LANGADM['Helperb9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé'; $_LANGADM['Helper08a38277b0309070706f6652eeae9a53'] = 'Bas'; $_LANGADM['Helper258f49887ef8d14ac268c92b02503aaa'] = 'Haut'; +$_LANGADM['Helper0bcef9c45bd8a48eda1b26eb0c61c869'] = '%'; $_LANGADM['Helper5ece607071fe59ddc4c88dc6abfe2310'] = 'Pas d\'éléments trouvés'; $_LANGADM['Helperb6b2856cbefa1dbe5da0b363e6426948'] = 'Page'; $_LANGADM['Helperb9987a246a537f4fe86f1f2e3d10dbdb'] = 'Afficher'; @@ -2116,7 +2117,7 @@ $_LANGADM['AdminGroupsc38266740494aa4980d05c606fccac10'] = 'Groupe clients'; $_LANGADM['AdminGroups38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer'; $_LANGADM['AdminGroups4e140ba723a03baa6948340bf90e2ef6'] = 'Nom :'; $_LANGADM['AdminGroups3e053943605d9e4bf7dd7588ea19e9d2'] = 'Réduction'; -$_LANGADM['AdminGroupsa1e7379abfdbc3b8e03506e5489c6110'] = 'Réduction:'; +$_LANGADM['AdminGroups3b78dd28e2767e0e88e5591abd386d0f'] = 'Réduction (en %) :'; $_LANGADM['AdminGroups6ad237b9a44e75f0f947efe1d5f1ccaa'] = 'Appliquera automatiquement une réduction sur TOUS les produits de la boutique pour les membres appartenant à ce groupe'; $_LANGADM['AdminGroups2dc9a383d693a2ded8b1ef832926ea93'] = 'Affichage des prix:'; $_LANGADM['AdminGroups35756bfdf07485441e0b1dd219025374'] = 'Comment afficher les prix pour ce groupe de client dans le détail de commande (taxes inclues / exclues).'; @@ -2143,6 +2144,7 @@ $_LANGADM['AdminGroups4dc140d81cf3f6cb74380715939311b9'] = 'Restrictions sur les $_LANGADM['AdminGroups4c41e0bd957698b58100a5c687d757d9'] = 'Tout sélectionnez'; $_LANGADM['AdminGroups237c7b6874386141a095e321c9fdfd38'] = 'Tout de-sélectionnez'; $_LANGADM['AdminGroups28c5141dead257ca0310f55a75a1fdf5'] = 'Cette catégorie existe déjà pour ce groupe'; +$_LANGADM['AdminGroupsa1e7379abfdbc3b8e03506e5489c6110'] = 'Réduction:'; $_LANGADM['AdminGroups0bcef9c45bd8a48eda1b26eb0c61c869'] = '%'; $_LANGADM['AdminGroupse7446ea32216e8bf4fa8cb6460b725d6'] = 'Ajouter une reduction sur une catégorie'; $_LANGADM['AdminGroups29ea3cf72fb288e76bc4310bffabc03e'] = 'Nouvelle réduction par catégorie pour un groupe'; @@ -3558,6 +3560,7 @@ $_LANGADM['AdminOrdersc453a4b8e8d98e82f35b67f433e3b4da'] = 'Paiement'; $_LANGADM['AdminOrdersec53a8c4f07baed5d8825072c89799be'] = 'Statut'; $_LANGADM['AdminOrders44749712dbec183e983dcd78a7736c41'] = 'Date'; $_LANGADM['AdminOrdersbcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF'; +$_LANGADM['AdminOrders1cca75fcdedeb02dfc5e9d5621adf6b1'] = 'Commande : Créer une commande'; $_LANGADM['AdminOrders6a5efd211a422296eab4adc476c98f0e'] = 'Retourner les produits'; $_LANGADM['AdminOrders4ad439b4f7069964e258259e049fa90c'] = 'Remboursement standart'; $_LANGADM['AdminOrders4b8def9be8f45a8d6baea36b26868965'] = 'Annuler les produits';