dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : fix #PSCFV-3244

Browse Source
This commit is contained in:
lLefevre
2012-07-18 09:17:33 +00:00
parent 541258da85
commit a6f7fed64f
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
+3 -1
View File
@@ -296,7 +296,9 @@ class AdminControllerCore extends Controller
26 => $this->l('Cover selection saved'),
27 => $this->l('Image shop association modified'),
28 => $this->l('Zone assigned to the selection successfully'),
29 => $this->l('Upgrade successful')
29 => $this->l('Upgrade successful'),
30 => $this->l('Partial refund successfully created'),
31 => $this->l('The discount successfully generated')
);
if (!$this->identifier) $this->identifier = 'id_'.$this->table;
controllers/admin/AdminOrdersController.php
+2 -2
View File
@@ -536,7 +536,7 @@ class AdminOrdersControllerCore extends AdminController
// Redirect if no errors
if (!count($this->errors))
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=24&token='.$this->token);
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=30&token='.$this->token);
}
else
$this->errors[] = Tools::displayError('Partial refund data is incorrect');
@@ -793,7 +793,7 @@ class AdminOrdersControllerCore extends AdminController
// Redirect if no errors
if (!count($this->errors))
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=24&token='.$this->token);
Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=31&token='.$this->token);
}
}
else
translations/fr/admin.php
+3 -1
View File
@@ -545,6 +545,7 @@ $_LANGADM['AdminController151648106e4bf98297882ea2ea1c4b0e'] = 'Mise à jour ré
$_LANGADM['AdminController16c64b6f203dd2b0a840184ef902a704'] = 'Module greffé sur le point d\'accroche avec succès';
$_LANGADM['AdminController18bbc44b29f81d10ca41aa4a1e4347d7'] = 'Si activé, ce message de confirmation va s\'afficher (facultatif)';
$_LANGADM['AdminController1a9c46c5de112e3cb217e0ec5576d499'] = 'Derniers clients';
$_LANGADM['AdminController1b990f4f52f2f8b942f8edb6860b9a81'] = 'La remise généré avec succès';
$_LANGADM['AdminController1fd3281c981e4608f951f980b7b8bf27'] = 'Total :';
$_LANGADM['AdminController2169b4627df97333ed94d1e30a9b8148'] = '%d errors';
$_LANGADM['AdminController23a61fdb216b255d81b0d49ca1abb8a4'] = 'Il y a %d avertissements.';
@@ -573,8 +574,8 @@ $_LANGADM['AdminController4f32a32dea642737580dd71cdfd8d3c0'] = 'Accès rapide';
$_LANGADM['AdminController5196611ad1bf27e9cef5375b038c04db'] = 'Faites-moi sortir d\'ici !';
$_LANGADM['AdminController529a53abbdf42a64cb2d149c0aeced04'] = 'Dernières commandes';
$_LANGADM['AdminController53cd939ae14e33855274e17a3c411fdd'] = 'Pour des raisons de sécurité, vous devez aussi :';
$_LANGADM['AdminController5590fa6353be8ff7cdc9fe03985b0b45'] = 'Remboursement partiel créé avec succès';
$_LANGADM['AdminController56deca22a707214865f7ea3ae6391d67'] = 'factures';
$_LANGADM['AdminController5b24b7eb082a90dbea88d12c746b6c54'] = 'Module téléchargé';
$_LANGADM['AdminController5bdc90e9608e48cc15f38ff360cd234a'] = 'Message affiché sur le bouton de validation (obligatoire)';
$_LANGADM['AdminController6175b106e638d4dd873cb3ff96724392'] = 'Miniatures régénérées avec succès';
$_LANGADM['AdminController630f6dc397fe74e52d5189e2c80f282b'] = 'Retour à la liste';
@@ -583,6 +584,7 @@ $_LANGADM['AdminController6b5ed001b03b7e1788ba881c15a08633'] = 'Module(s) instal
$_LANGADM['AdminController6fab17d3dc1147f9b170fb8e1aac2fa8'] = 'Lire le message';
$_LANGADM['AdminController77181afe06241c54ef771a23ee6da8f4'] = 'Derniers messages';
$_LANGADM['AdminController795aa39f13629841edad6c04d3aca405'] = 'Images déplacées avec succès';
$_LANGADM['AdminController7cfc3f369b8123e1c2d22a37b31a49a7'] = 'Module téléchargé avec succès';
$_LANGADM['AdminController7dce122004969d56ae2e0245cb754d35'] = 'Modifier';
$_LANGADM['AdminController84b4d8c8cdd02488c0f868e97b22a3c2'] = 'Création réussie';
$_LANGADM['AdminController8524de963f07201e5c086830d370797f'] = 'Chargement en cours...';