From 5de32bb047d1f9b4004d883a72eb32f1ada6ba9e Mon Sep 17 00:00:00 2001
From: nivcoo <36514752+nivcoo@users.noreply.github.com>
Date: Thu, 29 Nov 2018 22:59:48 +0100
Subject: [PATCH 01/45] New design

---
 Controller/CategoriesController.php           |  88 +++++++++++++++
 Controller/ShopController.php                 | 102 ++++++------------
 .../admin_add_category.ctp                    |   2 +-
 View/Categories/admin_index.ctp               |  40 +++++++
 View/Shop/admin_index.ctp                     |  58 +++++++---
 config.json                                   |   7 +-
 lang/en_US.json                               |   5 +
 lang/fr_FR.json                               |   6 ++
 8 files changed, 224 insertions(+), 84 deletions(-)
 create mode 100644 Controller/CategoriesController.php
 rename View/{Shop => Categories}/admin_add_category.ctp (88%)
 mode change 100755 => 100644
 create mode 100644 View/Categories/admin_index.ctp

diff --git a/Controller/CategoriesController.php b/Controller/CategoriesController.php
new file mode 100644
index 0000000..8057caf
--- /dev/null
+++ b/Controller/CategoriesController.php
@@ -0,0 +1,88 @@
+<?php
+
+class CategoriesController extends ShopAppController
+{
+    
+    public function admin_index()
+    {
+        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_ITEMS')) {
+            $this->set('title_for_layout', $this->Lang->get('SHOP__TITLE'));
+            $this->layout = 'admin';
+            $this->loadModel('Shop.Category');
+            $this->loadModel('Shop.Item');
+            $search_categories = $this->Category->find('all');
+            foreach ($search_categories as $v) {
+                $categories_count[$v['Category']['id']] = $this->Item->find('count', array('conditions' => array('category' => $v['Category']['id'])));
+            }
+            $this->set(compact('search_categories', 'categories_count'));
+            
+        }   else {
+            $this->redirect('/');
+        }
+    }
+    
+    public function admin_edit_category()
+    {
+        $this->autoRender = false;
+        $this->response->type('json');
+        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_CATEGORIES')) {
+            if ($this->request->is('post')) {
+                if (!empty($this->request->data['name'])) {
+
+                    $this->loadModel('Shop.Category');
+                    $this->Category->read(null, $this->request->data['id']);
+                    $this->Category->set(array(
+                        'name' => $this->request->data['name'],
+                    ));
+                    $this->Category->save();
+                    $this->response->body(json_encode(array('statut' => true, 'msg' => $this->Lang->get('SHOP__CATEGORY_EDIT_SUCCESS'))));
+                } else {
+                    $this->response->body(json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__FILL_ALL_FIELDS'))));
+                }
+            } else {
+                $this->response->body(json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__BAD_REQUEST'))));
+            }
+        } else {
+            throw new ForbiddenException();
+        }
+    }
+    
+    /*
+    * ======== Ajout d'une catégorie (affichage & traitement POST) ===========
+    */
+    
+    public function admin_add_category()
+    {
+        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_ITEMS')) {
+
+            $this->layout = 'admin';
+            $this->set('title_for_layout', $this->Lang->get('SHOP__CATEGORY_ADD'));
+            if ($this->request->is('post')) {
+                if (!empty($this->request->data['name'])) {
+                    $this->loadModel('Shop.Category');
+
+                    $event = new CakeEvent('beforeAddCategory', $this, array('category' => $this->request->data['name'], 'user' => $this->User->getAllFromCurrentUser()));
+                    $this->getEventManager()->dispatch($event);
+                    if ($event->isStopped()) {
+                        return $event->result;
+                    }
+
+                    $this->Category->read(null, null);
+                    $this->Category->set(array(
+                        'name' => $this->request->data['name'],
+                    ));
+                    $this->History->set('ADD_CATEGORY', 'shop');
+                    $this->Category->save();
+                    $this->Session->setFlash($this->Lang->get('SHOP__CATEGORY_ADD_SUCCESS'), 'default.success');
+                    $this->redirect(array('controller' => 'categories', 'action' => 'index', 'admin' => true));
+                } else {
+                    $this->Session->setFlash($this->Lang->get('ERROR__FILL_ALL_FIELDS'), 'default.error');
+                }
+            }
+        } else {
+            $this->redirect('/');
+        }
+    }
+    
+    
+}
diff --git a/Controller/ShopController.php b/Controller/ShopController.php
index 78e5d7d..1fed344 100755
--- a/Controller/ShopController.php
+++ b/Controller/ShopController.php
@@ -523,13 +523,23 @@ public function admin_index()
             $this->layout = 'admin';
 
             $this->loadModel('Shop.Item');
+            $this->loadModel('Shop.Category');
+            $this->loadModel('Server');
             $search_items = $this->Item->find('all', array('order' => 'order'));
             $items = array();
             foreach ($search_items as $key => $value) {
+                if (!$this->Category->find('first', array('conditions' => array('id' => $value['Item']['category'])))) {
+                    $search_items_other = $this->Item->find('all', array('conditions' => array('category' => $value['Item']['category'])));
+
+                    $search_server = $this->Server->find('all', array('conditions' => array('id' => unserialize($value['Item']['servers']))));
+                    foreach ($search_server as $v) {
+                        $item_server[$value['Item']['id']] .= $v['Server']['name'];
+                        $item_server[$value['Item']['id']] .= ', ';
+                    }
+                }
                 $items[$value['Item']['id']] = $value['Item']['name'];
             }
 
-            $this->loadModel('Shop.Category');
             $search_categories = $this->Category->find('all');
             foreach ($search_categories as $v) {
                 $categories[$v['Category']['id']]['name'] = $v['Category']['name'];
@@ -539,7 +549,7 @@ public function admin_index()
             $findConfig = $this->ItemsConfig->find('first');
             $config = (!empty($findConfig)) ? $findConfig['ItemsConfig'] : array();
 
-            $this->set(compact('categories', 'search_categories', 'search_items', 'config', 'items'));
+            $this->set(compact('categories', 'search_categories', 'search_items', 'config', 'items', 'search_items_other', 'item_server'));
 
         } else {
             $this->redirect('/');
@@ -829,7 +839,26 @@ public function admin_edit_ajax()
     /*
     * ======== Ajout d'un article (affichage) ===========
     */
+    
+    public function admin_test_item()
+    {
+        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_ITEMS')) {
 
+            $this->set('title_for_layout', $this->Lang->get('SHOP__ITEM_ADD'));
+            $this->layout = 'admin';
+            
+            $this->loadModel('Server');
+            foreach ($this->request->data['server'] as $serverId)
+                $this->Server->commands($this->request->data['commands'], $serverId);
+            
+            $this->response->body(json_encode(array('statut' => true, 'msg' => $this->Lang->get('SHOP__ITEM_ADD_SUCCESS'))));
+            $this->set(compact('servers'));
+
+        } else {
+            $this->redirect('/');
+        }
+    }
+    
     public function admin_add_item()
     {
         if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_ITEMS')) {
@@ -860,32 +889,7 @@ public function admin_add_item()
             $this->redirect('/');
         }
     }
-    public function admin_edit_category()
-    {
-        $this->autoRender = false;
-        $this->response->type('json');
-        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_CATEGORIES')) {
-            if ($this->request->is('post')) {
-                if (!empty($this->request->data['name'])) {
-
-                    $this->loadModel('Shop.Category');
-                    $this->Category->read(null, $this->request->data['id']);
-                    $this->Category->set(array(
-                        'name' => $this->request->data['name'],
-                    ));
-                    $this->Category->save();
-                    $this->response->body(json_encode(array('statut' => true, 'msg' => $this->Lang->get('SHOP__CATEGORY_EDIT_SUCCESS'))));
-                } else {
-                    $this->response->body(json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__FILL_ALL_FIELDS'))));
-                }
-            } else {
-                $this->response->body(json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__BAD_REQUEST'))));
-            }
-        } else {
-            throw new ForbiddenException();
-        }
-    }
-
+    
     /*
     * ======== Ajout d'un article (Traitement AJAX) ===========
     */
@@ -963,44 +967,6 @@ public function admin_add_item_ajax()
         }
     }
 
-
-    /*
-    * ======== Ajout d'une catégorie (affichage & traitement POST) ===========
-    */
-
-    public function admin_add_category()
-    {
-        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_ITEMS')) {
-
-            $this->layout = 'admin';
-            $this->set('title_for_layout', $this->Lang->get('SHOP__CATEGORY_ADD'));
-            if ($this->request->is('post')) {
-                if (!empty($this->request->data['name'])) {
-                    $this->loadModel('Shop.Category');
-
-                    $event = new CakeEvent('beforeAddCategory', $this, array('category' => $this->request->data['name'], 'user' => $this->User->getAllFromCurrentUser()));
-                    $this->getEventManager()->dispatch($event);
-                    if ($event->isStopped()) {
-                        return $event->result;
-                    }
-
-                    $this->Category->read(null, null);
-                    $this->Category->set(array(
-                        'name' => $this->request->data['name'],
-                    ));
-                    $this->History->set('ADD_CATEGORY', 'shop');
-                    $this->Category->save();
-                    $this->Session->setFlash($this->Lang->get('SHOP__CATEGORY_ADD_SUCCESS'), 'default.success');
-                    $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
-                } else {
-                    $this->Session->setFlash($this->Lang->get('ERROR__FILL_ALL_FIELDS'), 'default.error');
-                }
-            }
-        } else {
-            $this->redirect('/');
-        }
-    }
-
     /*
     * ======== Suppression d'une catégorie/article/paypal/starpass (traitement) ===========
     */
@@ -1043,10 +1009,10 @@ public function admin_delete($type = false, $id = false)
                         $this->Category->delete($id);
                         $this->History->set('DELETE_CATEGORY', 'shop');
                         $this->Session->setFlash($this->Lang->get('SHOP__CATEGORY_DELETE_SUCCESS'), 'default.success');
-                        $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+                        $this->redirect(array('controller' => 'categories', 'action' => 'index', 'admin' => true));
                     } else {
                         $this->Session->setFlash($this->Lang->get('UNKNONW_ID'), 'default.error');
-                        $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+                        $this->redirect(array('controller' => 'categories', 'action' => 'index', 'admin' => true));
                     }
                 } elseif ($type == "paypal") {
                     $this->loadModel('Shop.Paypal');
diff --git a/View/Shop/admin_add_category.ctp b/View/Categories/admin_add_category.ctp
old mode 100755
new mode 100644
similarity index 88%
rename from View/Shop/admin_add_category.ctp
rename to View/Categories/admin_add_category.ctp
index c476893..b386c75
--- a/View/Shop/admin_add_category.ctp
+++ b/View/Categories/admin_add_category.ctp
@@ -18,7 +18,7 @@
             <input type="hidden" name="data[_Token][key]" value="<?= $csrfToken ?>">
 
             <div class="pull-right">
-              <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'index', 'admin' => true)) ?>" class="btn btn-default"><?= $Lang->get('GLOBAL__CANCEL') ?></a>
+              <a href="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'index', 'admin' => true)) ?>" class="btn btn-default"><?= $Lang->get('GLOBAL__CANCEL') ?></a>
               <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
             </div>
           </form>
diff --git a/View/Categories/admin_index.ctp b/View/Categories/admin_index.ctp
new file mode 100644
index 0000000..0d95c96
--- /dev/null
+++ b/View/Categories/admin_index.ctp
@@ -0,0 +1,40 @@
+<section class="content">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title"><?= $Lang->get('SHOP__CATEGORIES') ?> &nbsp;&nbsp;<a href="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'add_category', 'admin' => true)) ?>" class="btn btn-success"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
+                </div>
+                <div class="box-body">
+                    <table class="table table-bordered">
+                        <thead>
+                            <tr>
+                                <th><?= $Lang->get('GLOBAL__NAME') ?></th>
+                                <th><?= $Lang->get('SHOP__CATEGORY_NUMBER') ?></th>
+                                <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <?php if(!empty($search_categories)) foreach ($search_categories as $value => $v) {?>
+                            <tr>
+                                <th>
+                                <form action="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'edit_category')) ?>" data-redirect-url="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'index', 'admin' => true)) ?>" method="post" data-ajax="true">
+                                    <input class="form-control transparent-input" name="name" type="text" value="<?=  $v["Category"]["name"] ?>">
+                                    <input type="hidden" name="id" value="<?= $v["Category"]["id"] ?>">
+                                </th>
+                                <th><?= $categories_count[$v['Category']['id']] ?></th>
+                                <th class="right">
+                                    <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
+                                    <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/category/'.$v["Category"]["id"], 'admin' => true)) ?>')" class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+                                    </form>
+                                </th>		
+                            </tr>
+                            <?php } ?>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/View/Shop/admin_index.ctp b/View/Shop/admin_index.ctp
index d506c2a..159f9e6 100755
--- a/View/Shop/admin_index.ctp
+++ b/View/Shop/admin_index.ctp
@@ -57,38 +57,30 @@
         <div class="box">
           <div class="box-header with-border">
             <h3 class="box-title"><?= $Lang->get('SHOP__ITEMS_AVAILABLE') ?> &nbsp;&nbsp;<a href="<?php if(!empty($search_categories)) { ?><?= $this->Html->url(array('controller' => 'shop', 'action' => 'add_item', 'admin' => true)) ?><?php } ?>" class="btn btn-success<?php if(empty($search_categories)) { echo ' disabled'; } ?>"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
-          </div>
-		  <div class="box-header with-border">
-            <h3 class="box-title"><?= $Lang->get('SHOP__CATEGORIES') ?> &nbsp;&nbsp;<a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'add_category', 'admin' => true)) ?>" class="btn btn-success"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
           </div>
           <div class="box-body">
 
             <table class="table table-bordered">
               <thead>
                 <tr>
-                  <th><?= $Lang->get('GLOBAL__NAME') ?></th>
+                  <th><?= $Lang->get('SHOP__CATEGORY') ?></th>
                   <th><?= $Lang->get('SHOP__ITEMS_AVAILABLE') ?></th>
                   <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
                   <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
                 </tr>
               </thead>
               <tbody id="sortable">
-                <?php foreach ($search_categories as $value => $v) {?>
+                <?php if(!empty($search_categories)) foreach ($search_categories as $value => $v) {?>
                   <tr class="item fixed">
                     <th>
-                      <form action="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'edit_category')) ?>" method="post" data-ajax="true">
-                        <input class="form-control transparent-input" name="name" type="text" value="<?=  $v["Category"]["name"] ?>">
-                        <input type="hidden" name="id" value="<?= $v["Category"]["id"] ?>">
+                        <?= $v["Category"]["name"] ?>
                     </th>
                     <th></th>
                     <th></th>
-                    <th class="right">
-                      <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
-                      <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/category/'.$v["Category"]["id"], 'admin' => true)) ?>')" class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
-                    </form></th>		
+                    <th></th>		
                   </tr>
-                  <?php $i=0; foreach ($search_items as $val => $va) { $i++; 
-                    if ($categories[$va["Item"]["category"]]['name'] == $v["Category"]["name"]) {
+                  <?php  $i=0; if(!empty($search_items)) foreach ($search_items as $val => $va) { $i++; 
+                    if ($va['Item']['category'] == $v["Category"]["id"]) {
                   ?>
                       <tr class="item" style="cursor:move;" id="<?= $va["Item"]["name"] ?>-<?= $i ?>">
                         <td></td>
@@ -110,6 +102,44 @@
         </div>
       </div>
     </div>
+    <div class="row">
+      <div class="col-md-12">
+        <div class="box">
+          <div class="box-header with-border">
+            <h3 class="box-title"><?= $Lang->get('SHOP__ITEMS_AVAILABLE_OTHER') ?></h3>
+          </div>
+          <div class="box-body">
+
+            <table class="table table-bordered">
+              <thead>
+                <tr>
+                  <th><?= $Lang->get('SHOP__ITEMS_AVAILABLE') ?></th>
+                  <th><?= $Lang->get('SERVER__TITLE') ?></th>
+                  <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
+                  <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
+                </tr>
+              </thead>
+              <tbody>
+                  <?php if(!empty($search_items_other)) foreach ($search_items_other as $val => $va) { 
+                  ?>
+                      <tr>
+                        <td><?= $va["Item"]["name"] ?></td>
+                        <td><?= $item_server[$va['Item']['id']] ?></td>
+                        <td><?= $va["Item"]["price"] ?> <?= $Configuration->getMoneyName() ?></td>
+                        <td class="right">
+                          <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'edit/'.$va["Item"]["id"], 'admin' => true)) ?>" class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
+                          <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/item/'.$va["Item"]["id"], 'admin' => true)) ?>')" class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+                        </td>
+                      </tr>
+                  <?php } ?>
+              </tbody>
+            </table>
+            <br>
+		  <div class="ajax-msg"></div>
+          </div>
+        </div>
+      </div>
+    </div>
     <div class="row">
       <div class="col-md-12">
         <div class="box">
diff --git a/config.json b/config.json
index 7bc4957..e66e45e 100755
--- a/config.json
+++ b/config.json
@@ -5,6 +5,11 @@
 			"icon": "shopping-cart",
 			"index": "3",
 			"menu": {
+                "Gérer les catégories": {
+					"icon": "list-alt",
+					"permission": "SHOP__ADMIN_MANAGE_CATEGORIES",
+					"route": "/admin/shop/categories"
+				},
 				"Gérer les articles": {
 					"icon": "shopping-basket",
 					"permission": "SHOP__ADMIN_MANAGE_ITEMS",
@@ -35,7 +40,7 @@
 	"version":"1.2.13",
 	"useEvents":true,
 	"permissions" : {
-		"available" : ["CREDIT_ACCOUNT", "CAN_BUY", "SHOP__ADMIN_MANAGE_ITEMS", "SHOP__ADMIN_MANAGE_VOUCHERS", "SHOP__ADMIN_MANAGE_PAYMENT", "SHOP__ADMIN_GIFTALL"],
+		"available" : ["CREDIT_ACCOUNT", "CAN_BUY", "SHOP__ADMIN_MANAGE_ITEMS", "SHOP__ADMIN_MANAGE_CATEGORIES", "SHOP__ADMIN_MANAGE_VOUCHERS", "SHOP__ADMIN_MANAGE_PAYMENT", "SHOP__ADMIN_GIFTALL"],
 		"default" : {
 			"0" : ["CREDIT_ACCOUNT", "CAN_BUY"],
 			"2" : ["CREDIT_ACCOUNT", "CAN_BUY"]
diff --git a/lang/en_US.json b/lang/en_US.json
index 3a8c14f..e22e4ee 100755
--- a/lang/en_US.json
+++ b/lang/en_US.json
@@ -156,6 +156,7 @@
 		"SHOP__ITEM_BUY_LIMIT_PLACEHOLDER": "Put 0 for no limit",
 		"SHOP__ITEM_WAIT_TIME": "Time interval between purchases",
 		"SHOP__ITEM_CANT_BUY_WAIT_TIME": "You can not buy item <i> {ITEM_NAME} </ i> now! Every purchase must be spaced from {WAIT_TIME}.",
+        "SHOP__ITEMS_AVAILABLE_OTHER":"Items not listed",
 
 		"SHOP__CATEGORIES": "Categories",
 		"SHOP__CATEGORY": "Category",
@@ -163,6 +164,7 @@
 		"SHOP__CATEGORY_ADD_SUCCESS": "Category added successfully!",
 		"SHOP__CATEGORY_EDIT_SUCCESS": "Category successfully modified!",
 		"SHOP__CATEGORY_DELETE_SUCCESS": "Category Successfully Deleted!",
+        "SHOP__CATEGORY_NUMBER": "Number of articles linked to the category",
 
 		"SHOP__BUY": "Buy",
 		"SHOP__BUY_CART": "See my cart",
@@ -219,6 +221,9 @@
 		"PERMISSIONS__SHOP__ADMIN_MANAGE_ITEMS": "Manage articles of the shop (Add, edit, delete)",
 		"PERMISSIONS__SHOP__ADMIN_MANAGE_VOUCHERS": "Manage the promotional codes of the shop (Add, remove)",
 		"PERMISSIONS__SHOP__ADMIN_MANAGE_PAYMENT": "Manage the payments of the shop (Add, edit, delete, validate the PSC ...)",
+        "PERMISSIONS__VOTE__ADMIN_VIEW_TOP":"Go to the top vote page",
+        "PERMISSIONS__SHOP__ADMIN_GIFTALL":"Manage the gifts (donation of points)",
+        "PERMISSIONS__SHOP__ADMIN_MANAGE_CATEGORIES":"Manage store categories (Add, Edit, Delete)",
 
 		"NOTIFICATION__NEW_VOUCHER": "A new promotional code is available!",
 		"NOTIFICATION__NEW_PSC": "A new PaySafeCard must be validated!",
diff --git a/lang/fr_FR.json b/lang/fr_FR.json
index 65022a6..e8620d8 100755
--- a/lang/fr_FR.json
+++ b/lang/fr_FR.json
@@ -156,6 +156,7 @@
   "SHOP__ITEM_BUY_LIMIT_PLACEHOLDER":"Mettez 0 pour aucune limite",
   "SHOP__ITEM_WAIT_TIME":"Intervalle de temps nécessaire entre chaque achats",
   "SHOP__ITEM_CANT_BUY_WAIT_TIME":"Vous ne pouvez pas acheter l'article <i>{ITEM_NAME}</i> maintenant ! Chaque achat doivent être espacé de {WAIT_TIME}.",
+  "SHOP__ITEMS_AVAILABLE_OTHER":"Articles non répertoriés",
 
   "SHOP__CATEGORIES": "Cat\u00e9gories",
   "SHOP__CATEGORY": "Cat\u00e9gorie",
@@ -163,6 +164,7 @@
   "SHOP__CATEGORY_ADD_SUCCESS": "Cat\u00e9gorie ajout\u00e9e avec succ\u00e8s !",
   "SHOP__CATEGORY_EDIT_SUCCESS": "Cat\u00e9gorie modifi\u00e9 avec succ\u00e8s !",
   "SHOP__CATEGORY_DELETE_SUCCESS": "Cat\u00e9gorie supprim\u00e9e avec succ\u00e8s !",
+  "SHOP__CATEGORY_NUMBER": "Nombre d'article lié à la catégorie",
 
   "SHOP__BUY": "Acheter",
   "SHOP__BUY_CART":"Voir mon panier",
@@ -219,6 +221,10 @@
   "PERMISSIONS__SHOP__ADMIN_MANAGE_ITEMS":"Gérer les articles de la boutique (Ajouter, éditer, supprimer)",
   "PERMISSIONS__SHOP__ADMIN_MANAGE_VOUCHERS":"Gérer les codes promotionnels de la boutique (Ajouter, supprimer)",
   "PERMISSIONS__SHOP__ADMIN_MANAGE_PAYMENT":"Gérer les paiements de la boutique (Ajouter, éditer, supprimer, valider les PSC...)",
+  "PERMISSIONS__VOTE__ADMIN_VIEW_TOP":"Accéder à la page du top vote",
+  "PERMISSIONS__SHOP__ADMIN_GIFTALL":"Gérer les cadeaux (don de points)",
+  "PERMISSIONS__SHOP__ADMIN_MANAGE_CATEGORIES":"Gérer les catégories de la boutique (Ajouter, éditer, supprimer)",
+  
 
   "NOTIFICATION__NEW_VOUCHER":"Un nouveau code promotionnel est disponible !",
   "NOTIFICATION__NEW_PSC":"Une nouvelle PaySafeCard doit être validée !",

From 9fe60a37d906c5f66aa348e20997b180be86b932 Mon Sep 17 00:00:00 2001
From: nivcoo <nico64800@live.fr>
Date: Thu, 29 Nov 2018 23:41:24 +0100
Subject: [PATCH 02/45] New design

---
 Controller/ShopController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Controller/ShopController.php b/Controller/ShopController.php
index 1fed344..0aa2ea3 100755
--- a/Controller/ShopController.php
+++ b/Controller/ShopController.php
@@ -527,6 +527,7 @@ public function admin_index()
             $this->loadModel('Server');
             $search_items = $this->Item->find('all', array('order' => 'order'));
             $items = array();
+            $item_server = array();
             foreach ($search_items as $key => $value) {
                 if (!$this->Category->find('first', array('conditions' => array('id' => $value['Item']['category'])))) {
                     $search_items_other = $this->Item->find('all', array('conditions' => array('category' => $value['Item']['category'])));

From 40b190cc1e3f73a41dc6613ffb77d69e07f34aad Mon Sep 17 00:00:00 2001
From: nivcoo <36514752+nivcoo@users.noreply.github.com>
Date: Fri, 30 Nov 2018 23:03:33 +0100
Subject: [PATCH 03/45] Remove useless function

---
 Controller/ShopController.php | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/Controller/ShopController.php b/Controller/ShopController.php
index 0aa2ea3..6f3fae0 100755
--- a/Controller/ShopController.php
+++ b/Controller/ShopController.php
@@ -841,25 +841,6 @@ public function admin_edit_ajax()
     * ======== Ajout d'un article (affichage) ===========
     */
     
-    public function admin_test_item()
-    {
-        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_ITEMS')) {
-
-            $this->set('title_for_layout', $this->Lang->get('SHOP__ITEM_ADD'));
-            $this->layout = 'admin';
-            
-            $this->loadModel('Server');
-            foreach ($this->request->data['server'] as $serverId)
-                $this->Server->commands($this->request->data['commands'], $serverId);
-            
-            $this->response->body(json_encode(array('statut' => true, 'msg' => $this->Lang->get('SHOP__ITEM_ADD_SUCCESS'))));
-            $this->set(compact('servers'));
-
-        } else {
-            $this->redirect('/');
-        }
-    }
-    
     public function admin_add_item()
     {
         if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_ITEMS')) {

From 9ff3e1a339722913bd22e06e224fd46644a42b40 Mon Sep 17 00:00:00 2001
From: nivcoo <nico64800@live.fr>
Date: Mon, 3 Dec 2018 18:52:57 +0100
Subject: [PATCH 04/45] Up version

---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.json b/config.json
index e66e45e..eb911bd 100755
--- a/config.json
+++ b/config.json
@@ -37,7 +37,7 @@
 		"Boutique": "/shop"
 	},
 	"author":"Eywek",
-	"version":"1.2.13",
+	"version":"1.2.14",
 	"useEvents":true,
 	"permissions" : {
 		"available" : ["CREDIT_ACCOUNT", "CAN_BUY", "SHOP__ADMIN_MANAGE_ITEMS", "SHOP__ADMIN_MANAGE_CATEGORIES", "SHOP__ADMIN_MANAGE_VOUCHERS", "SHOP__ADMIN_MANAGE_PAYMENT", "SHOP__ADMIN_GIFTALL"],

From 8ef956590ca5ca0b6cc91565e870a7f0806ed8b1 Mon Sep 17 00:00:00 2001
From: nivcoo <36514752+nivcoo@users.noreply.github.com>
Date: Wed, 2 Jan 2019 22:19:22 +0100
Subject: [PATCH 05/45] Fix. Table name

---
 Controller/GiftallController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Controller/GiftallController.php b/Controller/GiftallController.php
index 0716787..ccf08bf 100644
--- a/Controller/GiftallController.php
+++ b/Controller/GiftallController.php
@@ -15,7 +15,7 @@ public function admin_index()
 					
 					$db = ConnectionManager::getDataSource('default');
 					$number = $db->value($number, 'integer');
-					$db->query("UPDATE Users SET money = money + $number");
+					$db->query("UPDATE users SET money = money + $number");
 					
 					$this->History->set("GIFTALL_$number", "shop");
 					
@@ -31,4 +31,4 @@ public function admin_index()
 			throw new ForbiddenException();
 		}
 	}
-}
\ No newline at end of file
+}

From efd65eecb9a6a82041d44f6b45d7967b9f2fa865 Mon Sep 17 00:00:00 2001
From: Pierre LAGOUTTE <pierre.lagoutte@free.fr>
Date: Sun, 23 Dec 2018 20:43:17 +0100
Subject: [PATCH 06/45] Fix decimal prices error

The CMS returns an alert window containing "ERROR" if the price is decimal.
---
 Controller/ShopController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Controller/ShopController.php b/Controller/ShopController.php
index 6f3fae0..f6a235a 100755
--- a/Controller/ShopController.php
+++ b/Controller/ShopController.php
@@ -166,7 +166,7 @@ function ajax_get($id)
                 }
 
                 if ($reductional_items) {
-                    $item_price = $item_price - $reduction;
+                    $item_price = floor($item_price - $reduction);
 
                     $reduction = $reduction . ' ' . $this->Configuration->getMoneyName();
                     $reductional_items_list = '<i>' . implode('</i>, <i>', $reductional_items_list_display) . '</i>';

From 5d8cfc094db9b38ccb635314a5f71356233ee1ce Mon Sep 17 00:00:00 2001
From: Valentin T <Eywek@users.noreply.github.com>
Date: Sun, 3 Mar 2019 15:59:25 +0100
Subject: [PATCH 07/45] Update DiscountVoucherComponent.php

---
 Controller/Component/DiscountVoucherComponent.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Controller/Component/DiscountVoucherComponent.php b/Controller/Component/DiscountVoucherComponent.php
index 344befe..2f791cb 100755
--- a/Controller/Component/DiscountVoucherComponent.php
+++ b/Controller/Component/DiscountVoucherComponent.php
@@ -1,6 +1,6 @@
 <?php
 
-class DiscountVoucherComponent extends Object
+class DiscountVoucherComponent extends CakeObject
 {
 
     static private $items;

From 85da2e33048a3e47a451775546b62017d12d44b6 Mon Sep 17 00:00:00 2001
From: Valentin T <Eywek@users.noreply.github.com>
Date: Sun, 3 Mar 2019 15:59:40 +0100
Subject: [PATCH 08/45] Update DiscountVoucherComponent.php

---
 Controller/Component/DiscountVoucherComponent.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Controller/Component/DiscountVoucherComponent.php b/Controller/Component/DiscountVoucherComponent.php
index 2f791cb..8e594a6 100755
--- a/Controller/Component/DiscountVoucherComponent.php
+++ b/Controller/Component/DiscountVoucherComponent.php
@@ -1,5 +1,5 @@
 <?php
-
+App::uses('CakeObject', 'Core');
 class DiscountVoucherComponent extends CakeObject
 {
 

From 30a006ca456462508a400cb735b3bf88cbb76ed8 Mon Sep 17 00:00:00 2001
From: Valentin T <Eywek@users.noreply.github.com>
Date: Sun, 3 Mar 2019 16:05:57 +0100
Subject: [PATCH 09/45] Update DiscountVoucherComponent.php

---
 Controller/Component/DiscountVoucherComponent.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Controller/Component/DiscountVoucherComponent.php b/Controller/Component/DiscountVoucherComponent.php
index 8e594a6..b187ee0 100755
--- a/Controller/Component/DiscountVoucherComponent.php
+++ b/Controller/Component/DiscountVoucherComponent.php
@@ -1,5 +1,9 @@
 <?php
-App::uses('CakeObject', 'Core');
+if (file_exists(ROOT . DS . 'lib' . DS . 'Cake' . DS . 'Core' . DS . 'CakeObject.php')) {
+  App::uses('CakeObject', 'Core');
+} else {
+  class CakeObject extends Object {}
+}
 class DiscountVoucherComponent extends CakeObject
 {
 

From 02e8b329db7455fdd3270df52b1dc5c2da282023 Mon Sep 17 00:00:00 2001
From: Valentin T <Eywek@users.noreply.github.com>
Date: Sun, 3 Mar 2019 16:06:08 +0100
Subject: [PATCH 10/45] Update config.json

---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.json b/config.json
index eb911bd..1ada284 100755
--- a/config.json
+++ b/config.json
@@ -37,7 +37,7 @@
 		"Boutique": "/shop"
 	},
 	"author":"Eywek",
-	"version":"1.2.14",
+	"version":"1.2.15",
 	"useEvents":true,
 	"permissions" : {
 		"available" : ["CREDIT_ACCOUNT", "CAN_BUY", "SHOP__ADMIN_MANAGE_ITEMS", "SHOP__ADMIN_MANAGE_CATEGORIES", "SHOP__ADMIN_MANAGE_VOUCHERS", "SHOP__ADMIN_MANAGE_PAYMENT", "SHOP__ADMIN_GIFTALL"],

From 1ef8e636708f494548df9c475d712d458d87f303 Mon Sep 17 00:00:00 2001
From: Mathis <mathisfr45@gmail.com>
Date: Tue, 9 Apr 2019 19:35:06 +0200
Subject: [PATCH 11/45] Add Event onBuyMoney (Dedipass and Paypal only)

He return the credits, the price, the plateform (paypal or dedipass), and user id.
---
 Controller/PaymentController.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Controller/PaymentController.php b/Controller/PaymentController.php
index 351cb4d..0fd5739 100755
--- a/Controller/PaymentController.php
+++ b/Controller/PaymentController.php
@@ -1021,6 +1021,12 @@ public function ipn()
                                 ));
                                 $this->PaypalHistory->save();
 
+                                $event = new CakeEvent('onBuyPoints', $this, array('credits' => $findOffer['Paypal']['money'], 'price' => $payment_amount, 'plateform' => 'paypal', 'user_id' => $user_id));
+                                $this->getEventManager()->dispatch($event);
+                                if ($event->isStopped()) {
+                                    return $event->result;
+                                }
+
                                 $this->loadModel('Notification');
                                 $this->Notification->setToUser($this->Lang->get('NOTIFICATION__PAYPAL_IPN_VALIDED'), $user_id);
 
@@ -1200,6 +1206,12 @@ public function dedipass_ipn()
                         ));
                         $this->DedipassHistory->save();
 
+                        $event = new CakeEvent('onBuyPoints', $this, array('credits' => $virtual_currency, 'price' => $this->request->data['payout'], 'plateform' => 'dedipass', 'user_id' => $user_id));
+                        $this->getEventManager()->dispatch($event);
+                        if ($event->isStopped()) {
+                            return $event->result;
+                        }
+                        
                         $this->Session->setFlash($this->Lang->get('SHOP__DEDIPASS_PAYMENT_SUCCESS', array('{MONEY}' => $virtual_currency, '{MONEY_NAME}' => $this->Configuration->getMoneyName())), 'default.success');
                         $this->redirect(array('controller' => 'shop', 'action' => 'index'));
 

From 2c24c4540dc2e098b8d3419f29358c6a958d7e15 Mon Sep 17 00:00:00 2001
From: nivcoo <36514752+nivcoo@users.noreply.github.com>
Date: Sat, 27 Apr 2019 12:01:17 +0200
Subject: [PATCH 12/45] feat. Best Donator

---
 Controller/ShopController.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Controller/ShopController.php b/Controller/ShopController.php
index f6a235a..d02e015 100755
--- a/Controller/ShopController.php
+++ b/Controller/ShopController.php
@@ -59,6 +59,24 @@ function index($category = false)
 	if ($vagoal != 0){
 		$vawidth = round((str_replace(",", '.', $vanow*100/$vagoal)));
 	}
+	    
+	$best_donator_price = array();
+
+        foreach($histories_dedi as $get) {
+            $best_donator_price[$get["DedipassHistory"]["user_id"]] += $get["DedipassHistory"]["credits_gived"];
+        }
+        foreach($histories_paypal as $get) {
+            $best_donator_price[$get["PaypalHistory"]["user_id"]] += $get["PaypalHistory"]["credits_gived"];
+        }
+        foreach($histories_pay as $get) {
+            $best_donator_price[$get["PaysafecardHistory"]["user_id"]] += $get["PaysafecardHistory"]["credits_gived"];
+        }
+        foreach($histories_star as $get) {
+            $best_donator_price[$get["StarpassHistory"]["user_id"]] += $get["StarpassHistory"]["credits_gived"];
+        }
+        $best_donator_id = array_search(max($best_donator_price),$best_donator_price);
+        $best_donator = $this->User->find('first', ['conditions' => ['id' => $best_donator_id]]);
+        $best_donator = $best_donator['User'];
 		
         $search_categories = $this->Category->find('all'); // on cherche toutes les catégories et on envoie à la vue
 

From 057175c824d706e52b1a8522fc65d8aff5d579da Mon Sep 17 00:00:00 2001
From: nivcoo <36514752+nivcoo@users.noreply.github.com>
Date: Sun, 28 Apr 2019 17:45:41 +0200
Subject: [PATCH 13/45] feat. Best Donator

---
 Controller/ShopController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Controller/ShopController.php b/Controller/ShopController.php
index d02e015..9f32093 100755
--- a/Controller/ShopController.php
+++ b/Controller/ShopController.php
@@ -112,7 +112,7 @@ function index($category = false)
         $singular_money = $this->Configuration->getMoneyName(false);
         $plural_money = $this->Configuration->getMoneyName();
 
-        $this->set(compact('dedipass', 'vagoal', 'vawidth', 'paysafecard_enabled', 'money', 'starpass_offers', 'paypal_offers', 'search_first_category', 'search_categories', 'search_items', 'title_for_layout', 'vouchers', 'singular_money', 'plural_money'));
+        $this->set(compact('best_donator', 'dedipass', 'vagoal', 'vawidth', 'paysafecard_enabled', 'money', 'starpass_offers', 'paypal_offers', 'search_first_category', 'search_categories', 'search_items', 'title_for_layout', 'vouchers', 'singular_money', 'plural_money'));
     }
 
     /*

From 613dae0a8de880d1f263c48278a8a761010182e6 Mon Sep 17 00:00:00 2001
From: Javdu10 <jav.valentin@gmail.com>
Date: Thu, 31 Oct 2019 09:38:37 +0100
Subject: [PATCH 14/45] add Nano

---
 Controller/PaymentController.php | 156 +++++++++++++++++++++++++++++++
 Model/Nano.php                   |   2 +
 Model/NanoHistory.php            |   9 ++
 SQL/schema.php                   |  27 ++++++
 View/Payment/admin_add_nano.ctp  |  42 +++++++++
 View/Payment/admin_edit_nano.ctp |  42 +++++++++
 View/Payment/admin_index.ctp     |  90 +++++++++++++++++-
 lang/en_US.json                  |  13 ++-
 lang/fr_FR.json                  |  12 +++
 9 files changed, 390 insertions(+), 3 deletions(-)
 create mode 100644 Model/Nano.php
 create mode 100644 Model/NanoHistory.php
 create mode 100644 View/Payment/admin_add_nano.ctp
 create mode 100644 View/Payment/admin_edit_nano.ctp

diff --git a/Controller/PaymentController.php b/Controller/PaymentController.php
index 0fd5739..5974f23 100755
--- a/Controller/PaymentController.php
+++ b/Controller/PaymentController.php
@@ -41,6 +41,12 @@ public function admin_index()
                 $offersByID['paypal'][$value['Paypal']['id']] = $value['Paypal']['name'];
             }
 
+            $this->loadModel('Shop.Nano');
+            $offers['nano'] = $this->Nano->find('all');
+
+            foreach ($offers['nano'] as $key => $value) {
+                $offersByID['nano'][$value['Nano']['id']] = $value['Nano']['name'];
+            }
 
             // Les PaySafeCards c'est différents
 
@@ -144,6 +150,34 @@ public function admin_get_paypal_histories()
         }
     }
 
+    public function admin_get_nano_histories()
+    {
+        if ($this->isConnected && $this->Permissions->can('SHOP__ADMIN_MANAGE_ITEMS')) {
+            $this->response->body(json_encode([]));
+            exit();
+            $this->loadModel('Shop.Nano');
+
+            $this->autoRender = false;
+            $this->response->type('json');
+
+            $this->DataTable = $this->Components->load('DataTable');
+            $this->modelClass = 'NanoHistory';
+            $this->DataTable->initialize($this);
+            $this->paginate = array(
+                'fields' => array('NanoHistory.block_hash', 'User.pseudo', 'Nano.name', 'NanoHistory.payment_amount', 'NanoHistory.credits_gived', 'NanoHistory.created'),
+                'recursive' => 1
+            );
+            $this->DataTable->mDataProp = true;
+
+            $response = $this->DataTable->getResponse();
+
+            $this->response->body(json_encode($response));
+
+        } else {
+            throw new ForbiddenException();
+        }
+    }
+
     public function admin_get_paysafecard_histories()
     {
         if ($this->isConnected && $this->Permissions->can('SHOP__ADMIN_MANAGE_ITEMS')) {
@@ -666,6 +700,128 @@ public function admin_edit_paypal_ajax($id = false)
         }
     }
 
+    /*
+      * ======== Ajout d'une offre Nano (affichage) ===========
+      */
+
+      public function admin_add_nano()
+      {
+          if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_PAYMENT')) {
+  
+              $this->set('title_for_layout', $this->Lang->get('SHOP__NANO_OFFER_ADD'));
+              $this->layout = 'admin';
+          } else {
+              $this->redirect('/');
+          }
+      }
+
+    /*
+    * ======== Ajout d'une offre Nano (Traitement AJAX) ===========
+    */
+
+    public function admin_add_nano_ajax()
+    {
+        $this->autoRender = false;
+        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_PAYMENT')) {
+            if ($this->request->is('ajax')) {
+                if (!empty($this->request->data['name']) AND !empty($this->request->data['address']) AND !empty($this->request->data['price']) AND !empty($this->request->data['money'])) {
+                    $this->request->data['price'] = number_format($this->request->data['price'], 2, '.', '');
+                    $this->request->data['money'] = number_format($this->request->data['money'], 2, '.', '');
+                    if (substr( $this->request->data['address'], 0, 4 ) === "nano") { //TODO : Validate nano_ address
+                        $this->loadModel('Shop.Nano');
+                        $this->Nano->read(null, null);
+                        $this->Nano->set($this->request->data);
+                        $this->Nano->save();
+                        $this->History->set('ADD_NANO_OFFER', 'shop');
+                        $this->Session->setFlash($this->Lang->get('SHOP__NANO_OFFER_ADD_SUCCESS'), 'default.success');
+                        echo json_encode(array('statut' => true, 'msg' => $this->Lang->get('SHOP__NANO_OFFER_ADD_SUCCESS')));
+                    } else {
+                        echo json_encode(array('statut' => false, 'msg' => $this->Lang->get('USER__ERROR_EMAIL_NOT_VALID')));
+                    }
+                } else {
+                    echo json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__FILL_ALL_FIELDS')));
+                }
+            } else {
+                echo json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__BAD_REQUEST')));
+            }
+        } else {
+            throw new ForbiddenException();
+        }
+    }
+
+
+    /*
+      * ======== Modification d'une offre Nano (affichage) ===========
+      */
+
+    public function admin_edit_nano($id = false)
+    {
+        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_PAYMENT')) {
+
+            $this->set('title_for_layout', $this->Lang->get('SHOP__NANO_OFFER_EDIT'));
+            $this->layout = 'admin';
+            if ($id != false) {
+                $this->loadModel('Shop.Nano');
+                $search = $this->Nano->find('all', array('conditions' => array('id' => $id)));
+                if (!empty($search)) {
+                    $this->set(compact('id'));
+                    $this->set('nano', $search[0]['Nano']);
+                } else {
+                    $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+                }
+            } else {
+                $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+            }
+        } else {
+            $this->redirect('/');
+        }
+    }
+
+
+    /*
+      * ======== Modification d'une offre Nano (traitement AJAX) ===========
+      */
+
+    public function admin_edit_nano_ajax($id = false)
+    {
+        $this->autoRender = false;
+        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_PAYMENT')) {
+            if ($id != false) {
+                $this->loadModel('Shop.Nano');
+                $search = $this->Nano->find('all', array('conditions' => array('id' => $id)));
+                if (!empty($search)) {
+                    if ($this->request->is('ajax')) {
+                        if (!empty($this->request->data['name']) AND !empty($this->request->data['address']) AND !empty($this->request->data['price']) AND !empty($this->request->data['money'])) {
+                            $this->request->data['price'] = number_format($this->request->data['price'], 2, '.', '');
+                            $this->request->data['money'] = number_format($this->request->data['money'], 2, '.', '');
+                            if (substr( $this->request->data['address'], 0, 4 ) === "nano") { //TODO : Validate nano_ address
+                                $this->loadModel('Shop.Nano');
+                                $this->Nano->read(null, $id);
+                                $this->Nano->set($this->request->data);
+                                $this->Nano->save();
+                                $this->History->set('EDIT_NANO_OFFER', 'shop');
+                                $this->Session->setFlash($this->Lang->get('SHOP__NANO_OFFER_EDIT_SUCCESS'), 'default.success');
+                                echo json_encode(array('statut' => true, 'msg' => $this->Lang->get('SHOP__NANO_OFFER_EDIT_SUCCESS')));
+                            } else {
+                                echo json_encode(array('statut' => false, 'msg' => $this->Lang->get('USER__ERROR_EMAIL_NOT_VALID')));
+                            }
+                        } else {
+                            echo json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__FILL_ALL_FIELDS')));
+                        }
+                    } else {
+                        echo json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__BAD_REQUEST')));
+                    }
+                } else {
+                    echo json_encode(array('statut' => false, 'msg' => $this->Lang->get('UNKNONW_ID')));
+                }
+            } else {
+                throw new NotFoundException();
+            }
+        } else {
+            throw new ForbiddenException();
+        }
+    }
+
 
     /*
     * ======== Ajout d'une offre StarPass (affichage) ===========
diff --git a/Model/Nano.php b/Model/Nano.php
new file mode 100644
index 0000000..cd50bee
--- /dev/null
+++ b/Model/Nano.php
@@ -0,0 +1,2 @@
+<?php
+class Nano extends ShopAppModel {}
diff --git a/Model/NanoHistory.php b/Model/NanoHistory.php
new file mode 100644
index 0000000..aa72d2e
--- /dev/null
+++ b/Model/NanoHistory.php
@@ -0,0 +1,9 @@
+<?php
+class NanoHistory extends ShopAppModel {
+  public $belongsTo = array(
+    'User',
+    'Nano' => array(
+      'foreignKey' => 'offer_id'
+    )
+  );
+}
diff --git a/SQL/schema.php b/SQL/schema.php
index 4c76505..7daf7b0 100755
--- a/SQL/schema.php
+++ b/SQL/schema.php
@@ -125,6 +125,33 @@ public function after($event = array()) {
 		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
 	);
 
+	public $shop__nanos = array(
+		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
+		'address' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 65, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+		'name' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 50, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+		'price' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+		'money' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
+		'indexes' => array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1)
+		),
+		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+	);
+
+	public $shop__nano_histories = array(
+		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
+		'block_hash' => array('type' => 'string', 'null' => false, 'length' => 64, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+		'offer_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+		'payment_amount' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+		'credits_gived' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 10, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
+		'indexes' => array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1)
+		),
+		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+	);
+
 	public $shop__paysafecard_histories = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
 		'code' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
diff --git a/View/Payment/admin_add_nano.ctp b/View/Payment/admin_add_nano.ctp
new file mode 100644
index 0000000..d1dd9a5
--- /dev/null
+++ b/View/Payment/admin_add_nano.ctp
@@ -0,0 +1,42 @@
+<section class="content">
+  <div class="row">
+    <div class="col-md-12">
+      <div class="box">
+        <div class="box-header with-border">
+          <h3 class="box-title"><?= $Lang->get('SHOP__NANO_OFFER_ADD') ?></h3>
+        </div>
+        <div class="box-body">
+          <form action="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'add_nano_ajax', 'admin' => true)) ?>" method="post" data-ajax="true" data-redirect-url="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'index', 'admin' => true)) ?>">
+
+            <div class="ajax-msg"></div>
+
+            <div class="form-group">
+              <label><?= $Lang->get('GLOBAL__NAME') ?></label>
+              <input name="name" class="form-control" type="text">
+            </div>
+
+            <div class="form-group">
+              <label><?= "nano_..."//$Lang->get('USER__EMAIL') ?></label>
+              <input name="address" class="form-control" type="text">
+            </div>
+
+            <div class="form-group">
+              <label><?= $Lang->get('SHOP__ITEM_PRICE') ?></label>
+              <input name="price" class="form-control" type="text">
+            </div>
+
+            <div class="form-group">
+              <label><?= $Lang->get('SHOP__OFFER_MONEY_TO_ADD', array('{MONEY_NAME}' => $Configuration->getMoneyName())) ?></label>
+              <input name="money" class="form-control" type="text">
+            </div>
+
+            <div class="pull-right">
+              <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'index', 'admin' => true)) ?>" class="btn btn-default"><?= $Lang->get('GLOBAL__CANCEL') ?></a>
+              <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+</section>
diff --git a/View/Payment/admin_edit_nano.ctp b/View/Payment/admin_edit_nano.ctp
new file mode 100644
index 0000000..7eda328
--- /dev/null
+++ b/View/Payment/admin_edit_nano.ctp
@@ -0,0 +1,42 @@
+<section class="content">
+  <div class="row">
+    <div class="col-md-12">
+      <div class="box">
+        <div class="box-header with-border">
+          <h3 class="box-title"><?= $Lang->get('SHOP__NANO_OFFER_EDIT') ?></h3>
+        </div>
+        <div class="box-body">
+          <form action="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'edit_nano_ajax', 'admin' => true, $id)) ?>" method="post" data-ajax="true" data-redirect-url="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'index', 'admin' => true)) ?>">
+
+            <div class="ajax-msg"></div>
+
+            <div class="form-group">
+              <label><?= $Lang->get('GLOBAL__NAME') ?></label>
+              <input name="name" class="form-control" value="<?= $nano['name'] ?>" type="text">
+            </div>
+
+            <div class="form-group">
+              <label><?= "nano_..."//$Lang->get('USER__EMAIL') ?></label>
+              <input name="address" class="form-control" value="<?= $nano['address'] ?>" type="text">
+            </div>
+
+            <div class="form-group">
+              <label><?= $Lang->get('SHOP__ITEM_PRICE') ?></label>
+              <input name="price" class="form-control" value="<?= $nano['price'] ?>" type="text">
+            </div>
+
+            <div class="form-group">
+              <label><?= $Lang->get('SHOP__OFFER_MONEY_TO_ADD', array('{MONEY_NAME}' => $Configuration->getMoneyName())) ?></label>
+              <input name="money" class="form-control" value="<?= $nano['money'] ?>" type="text">
+            </div>
+
+            <div class="pull-right">
+              <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'index', 'admin' => true)) ?>" class="btn btn-default"><?= $Lang->get('GLOBAL__CANCEL') ?></a>
+              <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+</section>
diff --git a/View/Payment/admin_index.ctp b/View/Payment/admin_index.ctp
index 4a2cf45..7a407a0 100755
--- a/View/Payment/admin_index.ctp
+++ b/View/Payment/admin_index.ctp
@@ -18,7 +18,8 @@ table tr td:last-child > div.btn-group {
 
           <div class="nav-tabs-custom">
             <ul class="nav nav-tabs">
-              <li class="active"><a href="#tab_starpass" data-toggle="tab" aria-expanded="true">StarPass</a></li>
+              <li class="active"><a href="#tab_nano" data-toggle="tab" aria-expanded="false">Nano <img height="10px;" src="https://raw.githubusercontent.com/Joohansson/nanolinks/master/src/nano.gif" alt="Nano GIF"></a></li>
+              <li class=""><a href="#tab_starpass" data-toggle="tab" aria-expanded="true">StarPass</a></li>
               <li class=""><a href="#tab_paypal" data-toggle="tab" aria-expanded="false">PayPal</a></li>
               <li class=""><a href="#tab_psc" data-toggle="tab" aria-expanded="false">PaySafeCard</a></li>
               <li class=""><a href="#tab_dedipass" data-toggle="tab" aria-expanded="false">Dédipass</a></li>
@@ -28,7 +29,92 @@ table tr td:last-child > div.btn-group {
             </ul>
             <div class="tab-content">
               <?= $Module->loadModules('shop_payments_modal_admin_tab_content') ?>
-              <div class="tab-pane active" id="tab_starpass">
+              
+              <div class="tab-pane active" id="tab_nano">
+
+                <h3><?= $Lang->get('SHOP__NANO_OFFERS') ?> <a href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'add_nano', 'admin' => true)) ?>" class="btn btn-success pull-right"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
+
+                <br>
+                
+
+                <table class="table table-bordered">
+                  <thead>
+                    <tr>
+                      <th><?= $Lang->get('GLOBAL__NAME') ?></th>
+                      <th><?= $Lang->get('SHOP__NANO_MAIL') ?></th>
+                      <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
+                      <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
+                      <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
+                      <th><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <?php if(isset($offers['nano'])) { ?>
+                      <?php foreach ($offers['nano'] as $key => $value) { ?>
+                        <tr>
+                          <td><?= $value['Nano']['name'] ?></td>
+                          <td><?= $value['Nano']['address'] ?></td>
+                          <td><?= $value['Nano']['price'] ?></td>
+                          <td><?= $value['Nano']['money'] ?></td>
+                          <td><?= $Lang->date($value['Nano']['created']) ?></td>
+                          <td>
+                            <div class="btn-group" role="group">
+                              <a href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'edit_nano/'.$value["Nano"]["id"], 'admin' => true)) ?>" class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
+                              <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/nano/'.$value["Nano"]["id"], 'admin' => true)) ?>')" class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+                            </div>
+                          </td>
+                        </tr>
+                      <?php } ?>
+                    <?php } ?>
+                  </tbody>
+                </table>
+
+                <hr>
+
+                <h3><?= $Lang->get('SHOP__NANO_HISTORIES') ?></h3>
+
+                <table class="table table-bordered dataTable" id="histories_nano">
+                  <thead>
+                    <tr>
+                      <th><?= $Lang->get('SHOP__NANO_PAYMENT_ID') ?></th>
+                      <th><?= $Lang->get('USER__USERNAME') ?></th>
+                      <th><?= $Lang->get('SHOP__NANO_OFFER') ?></th>
+                      <th><?= $Lang->get('SHOP__GLOBAL_AMOUNT') ?></th>
+                      <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
+                      <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                  </tbody>
+                </table>
+                <script type="text/javascript">
+                $(document).ready(function() {
+                  // $('#histories_nano').DataTable({
+                  //   "paging": true,
+                  //   "lengthChange": false,
+                  //   "searching": false,
+                  //   "ordering": false,
+                  //   "info": false,
+                  //   "autoWidth": false,
+                  //   'searching': true,
+                  //   "bProcessing": true,
+                  //   "bServerSide": true,
+                  //   "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_nano_histories')) ?>",
+                  //   "aoColumns": [
+                  //       {mData:"NanoHistory.block_hash"},
+                  //       {mData:"User.pseudo"},
+                  //       {mData:"Nano.name"},
+                  //       {mData:"NanoHistory.payment_amount"},
+                  //       {mData:"NanoHistory.credits_gived"},
+                  //       {mData:"NanoHistory.created"}
+                  //   ],
+                  // });
+                });
+                </script>
+
+              </div>
+              
+              <div class="tab-pane" id="tab_starpass">
 
                 <h3><?= $Lang->get('SHOP__STARPASS_OFFERS') ?> <a href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'add_starpass', 'admin' => true)) ?>" class="btn btn-success pull-right"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
 
diff --git a/lang/en_US.json b/lang/en_US.json
index e22e4ee..27de35b 100755
--- a/lang/en_US.json
+++ b/lang/en_US.json
@@ -194,6 +194,17 @@
 		"SHOP__PAYPAL_PAYMENT_ID": "PayPal ID",
 		"SHOP__PAYPAL_PAYMENT_DELAY": "Users can be credited up to 5min after payment on PayPal.This delay depends on the services of PayPal.",
 
+		"SHOP__NANO_OFFERS": "Nano Offers",
+		"SHOP__NANO_OFFER": "Offer",
+		"SHOP__NANO_HISTORIES": "Nano transaction history",
+		"SHOP__NANO_MAIL": "adress (nano_...)",
+		"SHOP__NANO_OFFER_ADD": "Add a Nano offer",
+		"SHOP__NANO_OFFER_ADD_SUCCESS": "Nano Offer Successfully Added!",
+		"SHOP__NANO_OFFER_EDIT": "Modify a Nano offer",
+		"SHOP__NANO_OFFER_EDIT_SUCCESS": "Nano Offer Changed Successfully!",
+		"SHOP__NANO_OFFER_DELETE_SUCCESS": "The Nano offer has been deleted!",
+		"SHOP__NANO_PAYMENT_ID": "Block Hash",
+
 		"SHOP__OFFER_MONEY_TO_ADD": "How many {MONEY_NAME} do you want to give?",
 
 		"SHOP__STARPASS_OFFERS": "StarPass Offers",
@@ -232,7 +243,6 @@
 		"HISTORY__CATEGORY_SHOP": "Shop",
 		"HISTORY__CATEGORY_CREDIT_SHOP": "Shop Creditation",
 		"HISTORY__ACTION_VALID_PAYSAFECARD": "Validation of a PaySafeCard",
-		"HISTORY__ACTION_ADD_PAYSAFECARD": "Adding a PaySafeCard",
 		"HISTORY__ACTION_DELETE_VOUCHER": "Suppression of a promotional code",
 		"HISTORY__ACTION_ADD_VOUCHER": "Adding a promotional code",
 		"HISTORY__ACTION_BUY_MONEY_DEDIPASS": "Purchase of credits by Dédipass",
@@ -244,6 +254,7 @@
 		"HISTORY__ACTION_BUY_MONEY": "Buying Shop Points",
 		"HISTORY__ACTION_SEND_MONEY": "Send money",
 		"HISTORY__ACTION_ADD_PAYPAL_OFFER": "Adding a PayPal offer",
+		"HISTORY__ACTION_ADD_NANO_OFFER": "Adding a Nano offer",
 		"HISTORY__ACTION_ADD_STARPASS_OFFER": "Adding a StarPass offer",
 		"HISTORY__ACTION_DELETE_PAYPAL_OFFER": "Deleting a PayPal offer",
 		"HISTORY__ACTION_DELETE_STARPASS_OFFER": "Deleting a StarPass offer",
diff --git a/lang/fr_FR.json b/lang/fr_FR.json
index e8620d8..862aba9 100755
--- a/lang/fr_FR.json
+++ b/lang/fr_FR.json
@@ -194,6 +194,17 @@
   "SHOP__PAYPAL_PAYMENT_ID": "ID PayPal",
   "SHOP__PAYPAL_PAYMENT_DELAY":"Les utilisateurs peuvent être créditer jusqu'a 5min après le paiement sur PayPal. Ce délai dépends des services de PayPal.",
 
+  "SHOP__NANO_OFFERS": "Offres Nano",
+  "SHOP__NANO_OFFER":"Offre",
+  "SHOP__NANO_HISTORIES":"Historique des transactions Nano",
+  "SHOP__NANO_MAIL":"adresse (nano_...)",
+  "SHOP__NANO_OFFER_ADD": "Ajouter une offre Nano",
+  "SHOP__NANO_OFFER_ADD_SUCCESS": "Offre Nano ajout\u00e9e avec succ\u00e8s !",
+  "SHOP__NANO_OFFER_EDIT": "Modifier une offre Nano",
+  "SHOP__NANO_OFFER_EDIT_SUCCESS": "Offre Nano modifi\u00e9e avec succ\u00e8s !",
+  "SHOP__NANO_OFFER_DELETE_SUCCESS": "L'offre Nano \u00e0 bien \u00e9t\u00e9 supprim\u00e9e !",
+  "SHOP__NANO_PAYMENT_ID": "Block Hash",
+
   "SHOP__OFFER_MONEY_TO_ADD": "Combien de {MONEY_NAME} voulez-vous donner ?",
 
   "SHOP__STARPASS_OFFERS": "Offres StarPass",
@@ -245,6 +256,7 @@
   "HISTORY__ACTION_BUY_MONEY": "Achat de points boutique",
   "HISTORY__ACTION_SEND_MONEY": "Envoie d'argent",
   "HISTORY__ACTION_ADD_PAYPAL_OFFER":"Ajout d'une offre PayPal",
+  "HISTORY__ACTION_ADD_NANO_OFFER":"Ajout d'une offre Nano",
   "HISTORY__ACTION_ADD_STARPASS_OFFER":"Ajout d'une offre StarPass",
   "HISTORY__ACTION_DELETE_PAYPAL_OFFER":"Suppression d'une offre PayPal",
   "HISTORY__ACTION_DELETE_STARPASS_OFFER":"Suppression d'une offre StarPass",

From 297461eb92ed7777d3799ad7ca534be0a6b208e2 Mon Sep 17 00:00:00 2001
From: Javdu10 <jav.valentin@gmail.com>
Date: Thu, 31 Oct 2019 14:59:27 +0100
Subject: [PATCH 15/45] add Brainblocks

---
 Controller/PaymentController.php | 131 ++++++++++++++++++++++++++++++-
 Controller/ShopController.php    |  38 ++++++++-
 SQL/schema.php                   |   3 +-
 View/Elements/payments_modal.ctp |  58 ++++++++++++++
 View/Payment/admin_add_nano.ctp  |  11 +++
 View/Payment/admin_edit_nano.ctp |  11 +++
 View/Payment/admin_index.ctp     |   2 +
 lang/en_US.json                  |   2 +
 lang/fr_FR.json                  |   2 +
 9 files changed, 251 insertions(+), 7 deletions(-)

diff --git a/Controller/PaymentController.php b/Controller/PaymentController.php
index 5974f23..671ca77 100755
--- a/Controller/PaymentController.php
+++ b/Controller/PaymentController.php
@@ -6,7 +6,7 @@ class PaymentController extends ShopAppController
     public function beforeFilter()
     {
         parent::beforeFilter();
-        $this->Security->unlockedActions = array('starpass', 'starpass_verif', 'ipn', 'dedipass_ipn');
+        $this->Security->unlockedActions = array('starpass', 'starpass_verif', 'ipn', 'dedipass_ipn', 'verif_brainblocks');
     }
 
     /*
@@ -164,7 +164,7 @@ public function admin_get_nano_histories()
             $this->modelClass = 'NanoHistory';
             $this->DataTable->initialize($this);
             $this->paginate = array(
-                'fields' => array('NanoHistory.block_hash', 'User.pseudo', 'Nano.name', 'NanoHistory.payment_amount', 'NanoHistory.credits_gived', 'NanoHistory.created'),
+                'fields' => array('NanoHistory.token', 'User.pseudo', 'Nano.name', 'NanoHistory.payment_amount', 'NanoHistory.credits_gived', 'NanoHistory.created'),
                 'recursive' => 1
             );
             $this->DataTable->mDataProp = true;
@@ -1213,6 +1213,133 @@ public function ipn()
         }
     }
 
+    /*
+      * ======== Vérification d'une transaction PayPal ===========
+      */
+
+      public function verif_brainblocks()
+      { // cf. https://developer.paypal.com/docs/classic/ipn/gs_IPN/
+          $this->autoRender = false;
+  
+          if ($this->request->is('post')) { //On vérifie l'état de la requête
+  
+              // On assigne les variables
+              $token = $this->request->data['token'];
+              $user_id = $this->request->data['user_id'];
+              $nano_id = $this->request->data['nano_id'];
+              // On vérifie que l'utilisateur contenu dans le champ custom existe bien
+  
+              $this->loadModel('User');
+              if (!$this->User->exist($user_id)) {
+                  throw new InternalErrorException('Nano : Unknown user');
+              }
+  
+              // On prépare la requête de vérification
+              // On fais la requête
+  
+              $cURL = curl_init();
+              curl_setopt($cURL, CURLOPT_SSL_VERIFYPEER, false);
+              curl_setopt($cURL, CURLOPT_SSL_VERIFYHOST, false);
+              curl_setopt($cURL, CURLOPT_URL, "https://api.brainblocks.io/api/session/$token/verify");
+              curl_setopt($cURL, CURLOPT_ENCODING, 'gzip');
+              curl_setopt($cURL, CURLOPT_BINARYTRANSFER, true);
+              curl_setopt($cURL, CURLOPT_HEADER, false);
+              curl_setopt($cURL, CURLOPT_RETURNTRANSFER, true);
+              curl_setopt($cURL, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+              curl_setopt($cURL, CURLOPT_FORBID_REUSE, true);
+              curl_setopt($cURL, CURLOPT_FRESH_CONNECT, true);
+              curl_setopt($cURL, CURLOPT_CONNECTTIMEOUT, 30);
+              curl_setopt($cURL, CURLOPT_TIMEOUT, 60);
+              curl_setopt($cURL, CURLINFO_HEADER_OUT, true);
+              curl_setopt($cURL, CURLOPT_HTTPHEADER, array(
+                  'Connection: close',
+                  'Expect: ',
+              ));
+              $Response = curl_exec($cURL);
+              $Status = (int)curl_getinfo($cURL, CURLINFO_HTTP_CODE);
+              curl_close($cURL);
+  
+              // On traite la réponse
+              
+              // On vérifie que il y ai pas eu d'erreur
+  
+              if (empty($Response) || $Status != 200 || !$Status) {
+                  throw new InternalErrorException('Nano : Error with BrainBlocks Response');
+              }
+              $result = json_decode($Response, true);
+  
+              // On effectue les autres vérifications
+
+                      // On cherche l'offre avec ce montant là
+                      $this->loadModel('Shop.Nano');
+                      $findOffer = $this->Nano->find('first', array('conditions' => array('id' => $nano_id)));
+                      if (!empty($findOffer)) {
+  
+                          // On vérifie que ce soit le bon mail
+                          if ($result['destination'] == $findOffer['Nano']['address'] 
+                              && $result['currency'] == $findOffer['Nano']['currency'] && $result['amount'] == $findOffer['Nano']['price']
+                              && $result['fulfilled'] == true) {
+  
+                              // On vérifie que le paiement pas déjà en base de données
+                              $this->loadModel('Shop.NanoHistory');
+                              $findPayment = $this->NanoHistory->find('first', array('conditions' => array('token' => $token)));
+  
+                              if (empty($findPayment)) {
+  
+                                  // On récupére le solde de l'utilisateur et on ajoute ses nouveaux crédits
+                                  $sold = $this->User->getFromUser('money', $user_id);
+                                  $new_sold = floatval($sold + floatval($findOffer['Nano']['money']));
+  
+                                  // On ajoute l'argent à l'utilisateur
+                                  $this->User->setToUser('money', $new_sold, $user_id);
+  
+                                  // On l'ajoute dans l'historique global
+                                  $this->HistoryC = $this->Components->load('History');
+                                  $this->HistoryC->set('BUY_MONEY', 'shop', null, $user_id);
+  
+                                  // On l'ajoute dans l'historique des paiements
+                                  $this->NanoHistory->create();
+                                  $this->NanoHistory->set(array(
+                                      'token' => $token,
+                                      'user_id' => $user_id,
+                                      'offer_id' => $findOffer['Nano']['id'],
+                                      'payment_amount' => $findOffer['Nano']['price'],
+                                      'credits_gived' => $findOffer['Nano']['money']
+                                  ));
+                                  $this->PaypalHistory->save();
+  
+                                  $event = new CakeEvent('onBuyPoints', $this, array('credits' => $findOffer['Nano']['money'], 'price' => $findOffer['Nano']['price'], 'plateform' => 'nano', 'user_id' => $user_id));
+                                  $this->getEventManager()->dispatch($event);
+                                  if ($event->isStopped()) {
+                                      return $event->result;
+                                  }
+  
+                                  $this->loadModel('Notification');
+                                  $this->Notification->setToUser($this->Lang->get('NOTIFICATION__NANO_VALIDED'), $user_id);
+  
+                                  $this->response->statusCode(200);
+  
+                              } else {
+                                  throw new InternalErrorException('Nano : Payment already credited');
+                              }
+  
+                          } else {
+                              throw new InternalErrorException('Nano : invalid address');
+                          }
+  
+                      } else {
+                          throw new InternalErrorException('Nano : Unknown offer');
+                      }
+  
+                  
+  
+              
+  
+          } else {
+              throw new InternalErrorException('PayPal : Not post');
+          }
+      }
+
 
     /*
       * ======== Affichage Dédipass ===========
diff --git a/Controller/ShopController.php b/Controller/ShopController.php
index 9f32093..9eba9a0 100755
--- a/Controller/ShopController.php
+++ b/Controller/ShopController.php
@@ -31,11 +31,13 @@ function index($category = false)
         )); // on cherche tous les items et on envoie à la vue
 	$vanow = 0;
 	$this->loadModel('Shop.DedipassHistory');
-	$this->loadModel('Shop.PaypalHistory');
+    $this->loadModel('Shop.PaypalHistory');
+    $this->loadModel('Shop.NanoHistory');
 	$this->loadModel('Shop.StarpassHistory');
 	$this->loadModel('Shop.PaysafecardHistory');
 	$histories_dedi = $this->DedipassHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
-	$histories_paypal = $this->PaypalHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
+    $histories_paypal = $this->PaypalHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
+    $histories_nano = $this->NanoHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
 	$histories_pay = $this->PaysafecardHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
 	$histories_star = $this->StarpassHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
 	foreach ($histories_dedi as $value){
@@ -43,6 +45,9 @@ function index($category = false)
 	}
 	foreach ($histories_paypal as $value){
 		$vanow +=  floatval($value["PaypalHistory"]["payment_amount"]);
+    }
+    foreach ($histories_nano as $value){
+		$vanow +=  floatval($value["NanoHistory"]["payment_amount"]);
 	}
 	foreach ($histories_pay as $value){
 		$vanow +=  floatval($value["PaysafecardHistory"]["credits_gived"]);
@@ -68,6 +73,9 @@ function index($category = false)
         foreach($histories_paypal as $get) {
             $best_donator_price[$get["PaypalHistory"]["user_id"]] += $get["PaypalHistory"]["credits_gived"];
         }
+        foreach($histories_nano as $get) {
+            $best_donator_price[$get["NanoHistory"]["user_id"]] += $get["NanoHistory"]["credits_gived"];
+        }
         foreach($histories_pay as $get) {
             $best_donator_price[$get["PaysafecardHistory"]["user_id"]] += $get["PaysafecardHistory"]["credits_gived"];
         }
@@ -86,6 +94,9 @@ function index($category = false)
         $this->loadModel('Shop.Paypal');
         $paypal_offers = $this->Paypal->find('all');
 
+        $this->loadModel('Shop.Nano');
+        $nano_offers = $this->Nano->find('all');
+
         $this->loadModel('Shop.Starpass');
         $starpass_offers = $this->Starpass->find('all');
 
@@ -112,7 +123,7 @@ function index($category = false)
         $singular_money = $this->Configuration->getMoneyName(false);
         $plural_money = $this->Configuration->getMoneyName();
 
-        $this->set(compact('best_donator', 'dedipass', 'vagoal', 'vawidth', 'paysafecard_enabled', 'money', 'starpass_offers', 'paypal_offers', 'search_first_category', 'search_categories', 'search_items', 'title_for_layout', 'vouchers', 'singular_money', 'plural_money'));
+        $this->set(compact('best_donator', 'dedipass', 'vagoal', 'vawidth', 'paysafecard_enabled', 'money', 'starpass_offers', 'paypal_offers', 'nano_offers', 'search_first_category', 'search_categories', 'search_items', 'title_for_layout', 'vouchers', 'singular_money', 'plural_money'));
     }
 
     /*
@@ -1033,7 +1044,26 @@ public function admin_delete($type = false, $id = false)
                         $this->Session->setFlash($this->Lang->get('UNKNONW_ID'), 'default.error');
                         $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
                     }
-                } elseif ($type == "starpass") {
+                } elseif ($type == "nano") {
+                    $this->loadModel('Shop.Nano');
+                    $find = $this->Nano->find('all', array('conditions' => array('id' => $id)));
+                    if (!empty($find)) {
+
+                        $event = new CakeEvent('beforeDeleteNanoOffer', $this, array('offer_id' => $id, 'user' => $this->User->getAllFromCurrentUser()));
+                        $this->getEventManager()->dispatch($event);
+                        if ($event->isStopped()) {
+                            return $event->result;
+                        }
+
+                        $this->Nano->delete($id);
+                        $this->History->set('DELETE_NANO_OFFER', 'shop');
+                        $this->Session->setFlash($this->Lang->get('SHOP__NANO_OFFER_DELETE_SUCCESS'), 'default.success');
+                        $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+                    } else {
+                        $this->Session->setFlash($this->Lang->get('UNKNONW_ID'), 'default.error');
+                        $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+                    }
+                }elseif ($type == "starpass") {
                     $this->loadModel('Shop.Starpass');
                     $find = $this->Starpass->find('all', array('conditions' => array('id' => $id)));
                     if (!empty($find)) {
diff --git a/SQL/schema.php b/SQL/schema.php
index 7daf7b0..4b9533c 100755
--- a/SQL/schema.php
+++ b/SQL/schema.php
@@ -130,6 +130,7 @@ public function after($event = array()) {
 		'address' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 65, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
 		'name' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 50, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
 		'price' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+		'currency' => array('type' => 'string', 'eur' => false, 'length' => 3, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
 		'money' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
 		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
 		'indexes' => array(
@@ -140,7 +141,7 @@ public function after($event = array()) {
 
 	public $shop__nano_histories = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
-		'block_hash' => array('type' => 'string', 'null' => false, 'length' => 64, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+		'token' => array('type' => 'string', 'null' => false, 'length' => 255, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
 		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
 		'offer_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
 		'payment_amount' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
diff --git a/View/Elements/payments_modal.ctp b/View/Elements/payments_modal.ctp
index 3068f4a..5156f5a 100755
--- a/View/Elements/payments_modal.ctp
+++ b/View/Elements/payments_modal.ctp
@@ -64,6 +64,64 @@
               <br>
             </div>
           <?php } ?>
+          <?php if(!empty($nano_offers)) { ?>
+            <a class="btn btn-info btn-block" data-toggle="collapse" href="#Nano" aria-expanded="false" aria-controls="Nano">Nano</a>
+            <br>
+            <div class="collapse" id="Nano">
+              <form>
+                <script src="https://brainblocks.io/brainblocks.min.js"></script>
+                
+                <script>
+                  function renderBrainblocks(select){
+                    var val = $(select).val()
+                    var amount_address_currency = val.split('|')
+                    brainblocks.Button.render({
+                      payment: {
+                        amount: amount_address_currency[0],
+                        destination: amount_address_currency[1],
+                        currency: amount_address_currency[2],
+                      },
+                      onPayment: function(data) {
+                        var form = new FormData()
+                        form.append('token', data.token)
+                        form.append('user_id','<?= $user['id'] ?>')
+                        form.append('nano_id',amount_address_currency[3])
+                        $.ajax({
+                            url : '<?= $this->Html->url(array('controller' => 'payment', 'action' => 'verif_brainblocks'), true) ?>',
+                            type : 'POST',
+                            data : form,
+                            processData: false,
+                            contentType: false,
+                            dataType : 'json',     
+                            success : function(res){ 
+                                console.log(res);                          
+                            },
+                            error: function(res){
+                                console.log(res);
+                            }
+                        });
+                        <?= ''//$this->Html->url(array('controller' => 'shop', 'action' => 'index', 'return'), true) ?>
+                        <?= ''//$this->Html->url(array('controller' => 'shop', 'action' => 'index', 'error'), true) ?>
+                        
+                      }
+                    }, '#nano-button')
+                  }
+                </script>
+                <div class="form-group">
+                  <select class="form-control" onChange="renderBrainblocks(this)" >
+                    <option disabled selected>Choisissez une offre</option>
+                    <?php foreach ($nano_offers as $key => $value) { ?>
+                      <option value="<?= $value['Nano']['price'] ?>|<?= $value['Nano']['address'] ?>|<?= $value['Nano']['currency'] ?>|<?= $value['Nano']['id'] ?>" ><?= $value['Nano']['name'] ?></option>
+                    <?php } ?>
+                  </select>
+                  <div class="form-group">
+                    <div style="text-align: -webkit-center; margin-top: 2%;" id="nano-button"></div>
+                  </div>
+                </div>
+              </form>
+              <br>
+            </div>
+          <?php } ?>
           <?php if($paysafecard_enabled) { ?>
             <a class="btn btn-info btn-block" data-toggle="collapse" href="#PaySafeCard" aria-expanded="false" aria-controls="PaySafeCard">PaySafeCard</a>
             <br>
diff --git a/View/Payment/admin_add_nano.ctp b/View/Payment/admin_add_nano.ctp
index d1dd9a5..118c3ba 100644
--- a/View/Payment/admin_add_nano.ctp
+++ b/View/Payment/admin_add_nano.ctp
@@ -25,6 +25,17 @@
               <input name="price" class="form-control" type="text">
             </div>
 
+            <div class="form-group">
+              <label><?= $Lang->get('SHOP__ITEM_CURRENCY') ?></label>
+              <select name="currency" class="form-control">
+              <?php
+                  $currencies = [ "aed", "afn", "all", "amd", "ang", "aoa", "ars", "aud", "awg", "azn", "bam", "bbd", "bch", "bdt", "bgn", "bhd", "bif", "bmd", "bnd", "bob", "brl", "bsd", "btc", "btn", "bwp", "bzd", "cad", "cdf", "chf", "clf", "clp", "cny", "cop", "crc", "cup", "cve", "czk", "djf", "dkk", "dop", "dzd", "egp", "etb", "eur", "fjd", "fkp", "gbp", "gel", "ghs", "gip", "gmd", "gnf", "gtq", "gyd", "hkd", "hnl", "hrk", "htg", "huf", "idr", "ils", "inr", "iqd", "irr", "isk", "jep", "jmd", "jod", "jpy", "kes", "kgs", "khr", "kmf", "kpw", "krw", "kwd", "kyd", "kzt", "lak", "lbp", "lkr", "lrd", "lsl", "lyd", "mad", "mdl", "mga", "mkd", "mmk", "mnt", "mop", "mru", "mur", "mvr", "mwk", "mxn", "myr", "mzn", "nad", "ngn", "nio", "nok", "npr", "nzd", "omr", "pab", "pen", "pgk", "php", "pkr", "pln", "pyg", "qar", "rai", "ron", "rsd", "rub", "rwf", "sar", "sbd", "scr", "sdg", "sek", "sgd", "shp", "sll", "sos", "srd", "stn", "svc", "syp", "szl", "thb", "tjs", "tmt", "tnd", "top", "try", "ttd", "twd", "tzs", "uah", "ugx", "usd", "uyu", "uzs", "vef", "vnd", "vuv", "wst", "xaf", "xag", "xau", "xcd", "xof", "xpf", "yer", "zar", "zmw", "zwl" ];
+                  foreach ($currencies as $value) { ?>
+                    <option value="<?=$value?>"><?=$value?></option>
+                  <?php } ?>
+              </select>
+            </div>
+
             <div class="form-group">
               <label><?= $Lang->get('SHOP__OFFER_MONEY_TO_ADD', array('{MONEY_NAME}' => $Configuration->getMoneyName())) ?></label>
               <input name="money" class="form-control" type="text">
diff --git a/View/Payment/admin_edit_nano.ctp b/View/Payment/admin_edit_nano.ctp
index 7eda328..14a3407 100644
--- a/View/Payment/admin_edit_nano.ctp
+++ b/View/Payment/admin_edit_nano.ctp
@@ -25,6 +25,17 @@
               <input name="price" class="form-control" value="<?= $nano['price'] ?>" type="text">
             </div>
 
+            <div class="form-group">
+              <label><?= $Lang->get('SHOP__ITEM_CURRENCY') ?></label>
+              <select name="currency" class="form-control">
+                <?php
+                  $currencies = [ "aed", "afn", "all", "amd", "ang", "aoa", "ars", "aud", "awg", "azn", "bam", "bbd", "bch", "bdt", "bgn", "bhd", "bif", "bmd", "bnd", "bob", "brl", "bsd", "btc", "btn", "bwp", "bzd", "cad", "cdf", "chf", "clf", "clp", "cny", "cop", "crc", "cup", "cve", "czk", "djf", "dkk", "dop", "dzd", "egp", "etb", "eur", "fjd", "fkp", "gbp", "gel", "ghs", "gip", "gmd", "gnf", "gtq", "gyd", "hkd", "hnl", "hrk", "htg", "huf", "idr", "ils", "inr", "iqd", "irr", "isk", "jep", "jmd", "jod", "jpy", "kes", "kgs", "khr", "kmf", "kpw", "krw", "kwd", "kyd", "kzt", "lak", "lbp", "lkr", "lrd", "lsl", "lyd", "mad", "mdl", "mga", "mkd", "mmk", "mnt", "mop", "mru", "mur", "mvr", "mwk", "mxn", "myr", "mzn", "nad", "ngn", "nio", "nok", "npr", "nzd", "omr", "pab", "pen", "pgk", "php", "pkr", "pln", "pyg", "qar", "rai", "ron", "rsd", "rub", "rwf", "sar", "sbd", "scr", "sdg", "sek", "sgd", "shp", "sll", "sos", "srd", "stn", "svc", "syp", "szl", "thb", "tjs", "tmt", "tnd", "top", "try", "ttd", "twd", "tzs", "uah", "ugx", "usd", "uyu", "uzs", "vef", "vnd", "vuv", "wst", "xaf", "xag", "xau", "xcd", "xof", "xpf", "yer", "zar", "zmw", "zwl" ];
+                  foreach ($currencies as $value) { ?>
+                    <option <?= $value == $nano['currency'] ? 'selected=""':''?> value="<?=$value?>"><?=$value?></option>
+                  <?php } ?>
+              </select>
+            </div>
+
             <div class="form-group">
               <label><?= $Lang->get('SHOP__OFFER_MONEY_TO_ADD', array('{MONEY_NAME}' => $Configuration->getMoneyName())) ?></label>
               <input name="money" class="form-control" value="<?= $nano['money'] ?>" type="text">
diff --git a/View/Payment/admin_index.ctp b/View/Payment/admin_index.ctp
index 7a407a0..7a7b5e2 100755
--- a/View/Payment/admin_index.ctp
+++ b/View/Payment/admin_index.ctp
@@ -43,6 +43,7 @@ table tr td:last-child > div.btn-group {
                       <th><?= $Lang->get('GLOBAL__NAME') ?></th>
                       <th><?= $Lang->get('SHOP__NANO_MAIL') ?></th>
                       <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
+                      <th><?= "currency"//$Lang->get('SHOP__ITEM_PRICE') ?></th>
                       <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
                       <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
                       <th><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
@@ -55,6 +56,7 @@ table tr td:last-child > div.btn-group {
                           <td><?= $value['Nano']['name'] ?></td>
                           <td><?= $value['Nano']['address'] ?></td>
                           <td><?= $value['Nano']['price'] ?></td>
+                          <td><?= $value['Nano']['currency'] ?></td>
                           <td><?= $value['Nano']['money'] ?></td>
                           <td><?= $Lang->date($value['Nano']['created']) ?></td>
                           <td>
diff --git a/lang/en_US.json b/lang/en_US.json
index 27de35b..ee3e885 100755
--- a/lang/en_US.json
+++ b/lang/en_US.json
@@ -121,6 +121,7 @@
 		"SHOP__ITEM_NAME": "Name",
 		"SHOP__ITEM_IMG_URL": "URL of the image",
 		"SHOP__ITEM_PRICE": "Price",
+		"SHOP__ITEM_CURRNCY": "Currency",
 		"SHOP__ITEM_QUANTITY": "Quantity",
 		"SHOP__ITEM_TOTAL": "Total",
 		"SHOP__ITEM_DESCRIPTION": "Description",
@@ -239,6 +240,7 @@
 		"NOTIFICATION__NEW_VOUCHER": "A new promotional code is available!",
 		"NOTIFICATION__NEW_PSC": "A new PaySafeCard must be validated!",
 		"NOTIFICATION__PAYPAL_IPN_VALIDED": "Your PayPal payment has been confirmed!",
+		"NOTIFICATION__NANO_VALIDED": "Your Nano payment has been confirmed!",
 
 		"HISTORY__CATEGORY_SHOP": "Shop",
 		"HISTORY__CATEGORY_CREDIT_SHOP": "Shop Creditation",
diff --git a/lang/fr_FR.json b/lang/fr_FR.json
index 862aba9..7fdc90f 100755
--- a/lang/fr_FR.json
+++ b/lang/fr_FR.json
@@ -121,6 +121,7 @@
   "SHOP__ITEM_NAME":"Nom",
   "SHOP__ITEM_IMG_URL": "URL de l'image",
   "SHOP__ITEM_PRICE": "Prix",
+  "SHOP__ITEM_CURRENCY": "Monnaie",
   "SHOP__ITEM_QUANTITY":"Quantité",
   "SHOP__ITEM_TOTAL":"Total",
   "SHOP__ITEM_DESCRIPTION": "Description",
@@ -240,6 +241,7 @@
   "NOTIFICATION__NEW_VOUCHER":"Un nouveau code promotionnel est disponible !",
   "NOTIFICATION__NEW_PSC":"Une nouvelle PaySafeCard doit être validée !",
   "NOTIFICATION__PAYPAL_IPN_VALIDED":"Votre paiement PayPal vient d'être confirmé !",
+  "NOTIFICATION__NANO_VALIDED":"Votre paiement Nano vient d'être confirmé !",
 
   "HISTORY__CATEGORY_SHOP": "Boutique",
   "HISTORY__CATEGORY_CREDIT_SHOP": "Cr\u00e9ditation boutique",

From 0616530e69ee42d14bd9e8a5c59bb0765fd16ffd Mon Sep 17 00:00:00 2001
From: Javdu10 <jav.valentin@gmail.com>
Date: Thu, 31 Oct 2019 15:39:16 +0100
Subject: [PATCH 16/45] fix NanoHistory

---
 Controller/PaymentController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Controller/PaymentController.php b/Controller/PaymentController.php
index 671ca77..736f3da 100755
--- a/Controller/PaymentController.php
+++ b/Controller/PaymentController.php
@@ -1214,11 +1214,11 @@ public function ipn()
     }
 
     /*
-      * ======== Vérification d'une transaction PayPal ===========
+      * ======== Vérification d'une transaction Nano ===========
       */
 
       public function verif_brainblocks()
-      { // cf. https://developer.paypal.com/docs/classic/ipn/gs_IPN/
+      { // cf. https://brainblocks.io/
           $this->autoRender = false;
   
           if ($this->request->is('post')) { //On vérifie l'état de la requête
@@ -1306,7 +1306,7 @@ public function verif_brainblocks()
                                       'payment_amount' => $findOffer['Nano']['price'],
                                       'credits_gived' => $findOffer['Nano']['money']
                                   ));
-                                  $this->PaypalHistory->save();
+                                  $this->NanoHistory->save();
   
                                   $event = new CakeEvent('onBuyPoints', $this, array('credits' => $findOffer['Nano']['money'], 'price' => $findOffer['Nano']['price'], 'plateform' => 'nano', 'user_id' => $user_id));
                                   $this->getEventManager()->dispatch($event);
@@ -1336,7 +1336,7 @@ public function verif_brainblocks()
               
   
           } else {
-              throw new InternalErrorException('PayPal : Not post');
+              throw new InternalErrorException('Nano : Not post');
           }
       }
 

From 1b8ff95d34879c0ab988fe3acf126d0966e19ccf Mon Sep 17 00:00:00 2001
From: Javdu10 <jav.valentin@gmail.com>
Date: Thu, 31 Oct 2019 16:35:58 +0100
Subject: [PATCH 17/45] update token schema + money view + ajax result for
 verif_brainblocks

---
 Controller/PaymentController.php | 1 +
 Controller/ShopController.php    | 2 +-
 SQL/schema.php                   | 5 +++--
 View/Elements/payments_modal.ctp | 5 ++---
 View/Shop/index.ctp              | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Controller/PaymentController.php b/Controller/PaymentController.php
index 736f3da..8d95a9d 100755
--- a/Controller/PaymentController.php
+++ b/Controller/PaymentController.php
@@ -1318,6 +1318,7 @@ public function verif_brainblocks()
                                   $this->Notification->setToUser($this->Lang->get('NOTIFICATION__NANO_VALIDED'), $user_id);
   
                                   $this->response->statusCode(200);
+                                  echo json_encode(array('statut' => true, 'msg' => $this->Lang->get('NOTIFICATION__NANO_VALIDED')));
   
                               } else {
                                   throw new InternalErrorException('Nano : Payment already credited');
diff --git a/Controller/ShopController.php b/Controller/ShopController.php
index 9eba9a0..7b78fdf 100755
--- a/Controller/ShopController.php
+++ b/Controller/ShopController.php
@@ -115,7 +115,7 @@ function index($category = false)
         $money = 0;
         if ($this->isConnected) {
             $money = $this->User->getKey('money') . ' ';
-            $money += ($this->User->getKey('money') == 1 OR $this->User->getKey('money') == 0) ? $this->Configuration->getMoneyName(false) : $this->Configuration->getMoneyName();
+            $money .= ($this->User->getKey('money') == 1 OR $this->User->getKey('money') == 0) ? $this->Configuration->getMoneyName(false) : $this->Configuration->getMoneyName();
         }
 
         $vouchers = $this->DiscountVoucher;
diff --git a/SQL/schema.php b/SQL/schema.php
index 4b9533c..b3cf822 100755
--- a/SQL/schema.php
+++ b/SQL/schema.php
@@ -141,14 +141,15 @@ public function after($event = array()) {
 
 	public $shop__nano_histories = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
-		'token' => array('type' => 'string', 'null' => false, 'length' => 255, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+		'token' => array('type' => 'string', 'null' => false, 'length' => 300, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
 		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
 		'offer_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
 		'payment_amount' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
 		'credits_gived' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 10, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
 		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
 		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'U_token' => array('column' => 'token', 'unique' => 1)
 		),
 		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
 	);
diff --git a/View/Elements/payments_modal.ctp b/View/Elements/payments_modal.ctp
index 5156f5a..731fb2b 100755
--- a/View/Elements/payments_modal.ctp
+++ b/View/Elements/payments_modal.ctp
@@ -94,14 +94,13 @@
                             contentType: false,
                             dataType : 'json',     
                             success : function(res){ 
-                                console.log(res);                          
+                                if(res.statut)
+                                  window.location.reload()
                             },
                             error: function(res){
                                 console.log(res);
                             }
                         });
-                        <?= ''//$this->Html->url(array('controller' => 'shop', 'action' => 'index', 'return'), true) ?>
-                        <?= ''//$this->Html->url(array('controller' => 'shop', 'action' => 'index', 'error'), true) ?>
                         
                       }
                     }, '#nano-button')
diff --git a/View/Shop/index.ctp b/View/Shop/index.ctp
index b350b35..abded62 100755
--- a/View/Shop/index.ctp
+++ b/View/Shop/index.ctp
@@ -3,7 +3,7 @@
 <div class="container plugin-shop">
   <div class="row">
     <div class="col-md-3">
-      <p class="lead"><?= ($isConnected) ? $money.' '.$Configuration->getMoneyName() : $Lang->get('SHOP__TITLE'); ?></p>
+      <p class="lead"><?= ($isConnected) ? $money: $Lang->get('SHOP__TITLE'); ?></p>
         <div class="list-group">
             <?php
             $i = 0;

From 22a359bccb90919372f9cf3dfdeaab1f1e2ceb8e Mon Sep 17 00:00:00 2001
From: Javdu10 <jav.valentin@gmail.com>
Date: Thu, 31 Oct 2019 18:47:50 +0100
Subject: [PATCH 18/45] fix shop button for mobile + Currency display

---
 View/Payment/admin_index.ctp | 4 ++--
 View/Shop/index.ctp          | 4 ++--
 lang/en_US.json              | 4 ++--
 lang/fr_FR.json              | 3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/View/Payment/admin_index.ctp b/View/Payment/admin_index.ctp
index 7a7b5e2..c1bddbc 100755
--- a/View/Payment/admin_index.ctp
+++ b/View/Payment/admin_index.ctp
@@ -41,9 +41,9 @@ table tr td:last-child > div.btn-group {
                   <thead>
                     <tr>
                       <th><?= $Lang->get('GLOBAL__NAME') ?></th>
-                      <th><?= $Lang->get('SHOP__NANO_MAIL') ?></th>
+                      <th><?= $Lang->get('SHOP__NANO_ADDRESS') ?></th>
                       <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
-                      <th><?= "currency"//$Lang->get('SHOP__ITEM_PRICE') ?></th>
+                      <th><?= $Lang->get('SHOP__ITEM_CURRENCY') ?></th>
                       <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
                       <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
                       <th><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
diff --git a/View/Shop/index.ctp b/View/Shop/index.ctp
index abded62..c8d642e 100755
--- a/View/Shop/index.ctp
+++ b/View/Shop/index.ctp
@@ -2,7 +2,7 @@
 <?= $this->Html->css('Shop.jquery.bootstrap-touchspin.css') ?>
 <div class="container plugin-shop">
   <div class="row">
-    <div class="col-md-3">
+    <div class="col-xs-12 col-md-3">
       <p class="lead"><?= ($isConnected) ? $money: $Lang->get('SHOP__TITLE'); ?></p>
         <div class="list-group">
             <?php
@@ -30,7 +30,7 @@
           <a href="#" data-toggle="modal" data-target="#cart-modal" class="btn btn-primary btn-block pull-right"><?= $Lang->get('SHOP__BUY_CART') ?></a>
         <?php } ?>
       </div>
-      <div class="col-md-9">
+      <div class="col-xs-12 col-md-9">
         <div class="row">
           <?= $vouchers->get_vouchers() // Les promotions en cours ?>
         </div>
diff --git a/lang/en_US.json b/lang/en_US.json
index ee3e885..8f5a0d6 100755
--- a/lang/en_US.json
+++ b/lang/en_US.json
@@ -158,7 +158,7 @@
 		"SHOP__ITEM_WAIT_TIME": "Time interval between purchases",
 		"SHOP__ITEM_CANT_BUY_WAIT_TIME": "You can not buy item <i> {ITEM_NAME} </ i> now! Every purchase must be spaced from {WAIT_TIME}.",
         "SHOP__ITEMS_AVAILABLE_OTHER":"Items not listed",
-
+		"SHOP__ITEM_CURRENCY":"Currency",
 		"SHOP__CATEGORIES": "Categories",
 		"SHOP__CATEGORY": "Category",
 		"SHOP__CATEGORY_ADD": "Add a category",
@@ -198,7 +198,7 @@
 		"SHOP__NANO_OFFERS": "Nano Offers",
 		"SHOP__NANO_OFFER": "Offer",
 		"SHOP__NANO_HISTORIES": "Nano transaction history",
-		"SHOP__NANO_MAIL": "adress (nano_...)",
+		"SHOP__NANO_ADDRESS": "address (nano_...)",
 		"SHOP__NANO_OFFER_ADD": "Add a Nano offer",
 		"SHOP__NANO_OFFER_ADD_SUCCESS": "Nano Offer Successfully Added!",
 		"SHOP__NANO_OFFER_EDIT": "Modify a Nano offer",
diff --git a/lang/fr_FR.json b/lang/fr_FR.json
index 7fdc90f..36d31e7 100755
--- a/lang/fr_FR.json
+++ b/lang/fr_FR.json
@@ -158,7 +158,6 @@
   "SHOP__ITEM_WAIT_TIME":"Intervalle de temps nécessaire entre chaque achats",
   "SHOP__ITEM_CANT_BUY_WAIT_TIME":"Vous ne pouvez pas acheter l'article <i>{ITEM_NAME}</i> maintenant ! Chaque achat doivent être espacé de {WAIT_TIME}.",
   "SHOP__ITEMS_AVAILABLE_OTHER":"Articles non répertoriés",
-
   "SHOP__CATEGORIES": "Cat\u00e9gories",
   "SHOP__CATEGORY": "Cat\u00e9gorie",
   "SHOP__CATEGORY_ADD": "Ajouter une cat\u00e9gorie",
@@ -198,7 +197,7 @@
   "SHOP__NANO_OFFERS": "Offres Nano",
   "SHOP__NANO_OFFER":"Offre",
   "SHOP__NANO_HISTORIES":"Historique des transactions Nano",
-  "SHOP__NANO_MAIL":"adresse (nano_...)",
+  "SHOP__NANO_ADDRESS":"adresse (nano_...)",
   "SHOP__NANO_OFFER_ADD": "Ajouter une offre Nano",
   "SHOP__NANO_OFFER_ADD_SUCCESS": "Offre Nano ajout\u00e9e avec succ\u00e8s !",
   "SHOP__NANO_OFFER_EDIT": "Modifier une offre Nano",

From 4599ac6bb4848dc4c018cf23196a828f1847e85d Mon Sep 17 00:00:00 2001
From: Javdu10 <jav.valentin@gmail.com>
Date: Thu, 31 Oct 2019 19:00:16 +0100
Subject: [PATCH 19/45] verify nano address format

---
 Controller/PaymentController.php | 6 +++---
 lang/en_US.json                  | 2 +-
 lang/fr_FR.json                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Controller/PaymentController.php b/Controller/PaymentController.php
index 8d95a9d..c423f61 100755
--- a/Controller/PaymentController.php
+++ b/Controller/PaymentController.php
@@ -726,8 +726,8 @@ public function admin_add_nano_ajax()
             if ($this->request->is('ajax')) {
                 if (!empty($this->request->data['name']) AND !empty($this->request->data['address']) AND !empty($this->request->data['price']) AND !empty($this->request->data['money'])) {
                     $this->request->data['price'] = number_format($this->request->data['price'], 2, '.', '');
-                    $this->request->data['money'] = number_format($this->request->data['money'], 2, '.', '');
-                    if (substr( $this->request->data['address'], 0, 4 ) === "nano") { //TODO : Validate nano_ address
+                    $this->request->data['money'] = number_format($this->request->data['money'], 2, '.', '');                  
+                    if (preg_match("/nano_[13][13-9a-km-uw-z]{59}/",$this->request->data['address'])) {
                         $this->loadModel('Shop.Nano');
                         $this->Nano->read(null, null);
                         $this->Nano->set($this->request->data);
@@ -736,7 +736,7 @@ public function admin_add_nano_ajax()
                         $this->Session->setFlash($this->Lang->get('SHOP__NANO_OFFER_ADD_SUCCESS'), 'default.success');
                         echo json_encode(array('statut' => true, 'msg' => $this->Lang->get('SHOP__NANO_OFFER_ADD_SUCCESS')));
                     } else {
-                        echo json_encode(array('statut' => false, 'msg' => $this->Lang->get('USER__ERROR_EMAIL_NOT_VALID')));
+                        echo json_encode(array('statut' => false, 'msg' => $this->Lang->get('SHOP__ERROR_NANO_ADDRESS_NOT_VALID')));
                     }
                 } else {
                     echo json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__FILL_ALL_FIELDS')));
diff --git a/lang/en_US.json b/lang/en_US.json
index 8f5a0d6..ff83683 100755
--- a/lang/en_US.json
+++ b/lang/en_US.json
@@ -205,7 +205,7 @@
 		"SHOP__NANO_OFFER_EDIT_SUCCESS": "Nano Offer Changed Successfully!",
 		"SHOP__NANO_OFFER_DELETE_SUCCESS": "The Nano offer has been deleted!",
 		"SHOP__NANO_PAYMENT_ID": "Block Hash",
-
+		"SHOP__ERROR_NANO_ADDRESS_NOT_VALID":"The Nano address in invalid!",
 		"SHOP__OFFER_MONEY_TO_ADD": "How many {MONEY_NAME} do you want to give?",
 
 		"SHOP__STARPASS_OFFERS": "StarPass Offers",
diff --git a/lang/fr_FR.json b/lang/fr_FR.json
index 36d31e7..613a441 100755
--- a/lang/fr_FR.json
+++ b/lang/fr_FR.json
@@ -204,7 +204,7 @@
   "SHOP__NANO_OFFER_EDIT_SUCCESS": "Offre Nano modifi\u00e9e avec succ\u00e8s !",
   "SHOP__NANO_OFFER_DELETE_SUCCESS": "L'offre Nano \u00e0 bien \u00e9t\u00e9 supprim\u00e9e !",
   "SHOP__NANO_PAYMENT_ID": "Block Hash",
-
+  "SHOP__ERROR_NANO_ADDRESS_NOT_VALID":"L'adresse Nano n'est pas valide !",
   "SHOP__OFFER_MONEY_TO_ADD": "Combien de {MONEY_NAME} voulez-vous donner ?",
 
   "SHOP__STARPASS_OFFERS": "Offres StarPass",

From e74e584df37b086852de76bd6d439ae344efd7ba Mon Sep 17 00:00:00 2001
From: Javdu10 <jav.valentin@gmail.com>
Date: Thu, 31 Oct 2019 19:30:14 +0100
Subject: [PATCH 20/45] fix nano_histories + Lang + logo

---
 Controller/PaymentController.php |  9 +++----
 SQL/schema.php                   |  1 +
 View/Elements/payments_modal.ctp |  2 +-
 View/Payment/admin_index.ctp     | 44 ++++++++++++++++----------------
 lang/en_US.json                  |  1 -
 lang/fr_FR.json                  |  1 -
 6 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/Controller/PaymentController.php b/Controller/PaymentController.php
index c423f61..9a04faf 100755
--- a/Controller/PaymentController.php
+++ b/Controller/PaymentController.php
@@ -153,8 +153,6 @@ public function admin_get_paypal_histories()
     public function admin_get_nano_histories()
     {
         if ($this->isConnected && $this->Permissions->can('SHOP__ADMIN_MANAGE_ITEMS')) {
-            $this->response->body(json_encode([]));
-            exit();
             $this->loadModel('Shop.Nano');
 
             $this->autoRender = false;
@@ -164,7 +162,7 @@ public function admin_get_nano_histories()
             $this->modelClass = 'NanoHistory';
             $this->DataTable->initialize($this);
             $this->paginate = array(
-                'fields' => array('NanoHistory.token', 'User.pseudo', 'Nano.name', 'NanoHistory.payment_amount', 'NanoHistory.credits_gived', 'NanoHistory.created'),
+                'fields' => array('User.pseudo', 'Nano.name', 'NanoHistory.payment_amount', 'NanoHistory.currency', 'NanoHistory.credits_gived', 'NanoHistory.created'),
                 'recursive' => 1
             );
             $this->DataTable->mDataProp = true;
@@ -794,7 +792,7 @@ public function admin_edit_nano_ajax($id = false)
                         if (!empty($this->request->data['name']) AND !empty($this->request->data['address']) AND !empty($this->request->data['price']) AND !empty($this->request->data['money'])) {
                             $this->request->data['price'] = number_format($this->request->data['price'], 2, '.', '');
                             $this->request->data['money'] = number_format($this->request->data['money'], 2, '.', '');
-                            if (substr( $this->request->data['address'], 0, 4 ) === "nano") { //TODO : Validate nano_ address
+                            if (preg_match("/nano_[13][13-9a-km-uw-z]{59}/",$this->request->data['address'])) {
                                 $this->loadModel('Shop.Nano');
                                 $this->Nano->read(null, $id);
                                 $this->Nano->set($this->request->data);
@@ -803,7 +801,7 @@ public function admin_edit_nano_ajax($id = false)
                                 $this->Session->setFlash($this->Lang->get('SHOP__NANO_OFFER_EDIT_SUCCESS'), 'default.success');
                                 echo json_encode(array('statut' => true, 'msg' => $this->Lang->get('SHOP__NANO_OFFER_EDIT_SUCCESS')));
                             } else {
-                                echo json_encode(array('statut' => false, 'msg' => $this->Lang->get('USER__ERROR_EMAIL_NOT_VALID')));
+                                echo json_encode(array('statut' => false, 'msg' => $this->Lang->get('SHOP__ERROR_NANO_ADDRESS_NOT_VALID')));
                             }
                         } else {
                             echo json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__FILL_ALL_FIELDS')));
@@ -1304,6 +1302,7 @@ public function verif_brainblocks()
                                       'user_id' => $user_id,
                                       'offer_id' => $findOffer['Nano']['id'],
                                       'payment_amount' => $findOffer['Nano']['price'],
+                                      'currency' => $findOffer['Nano']['currency'],
                                       'credits_gived' => $findOffer['Nano']['money']
                                   ));
                                   $this->NanoHistory->save();
diff --git a/SQL/schema.php b/SQL/schema.php
index b3cf822..ddc2d35 100755
--- a/SQL/schema.php
+++ b/SQL/schema.php
@@ -145,6 +145,7 @@ public function after($event = array()) {
 		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
 		'offer_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
 		'payment_amount' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+		'currency' => array('type' => 'string', 'eur' => false, 'length' => 3, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
 		'credits_gived' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 10, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
 		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
 		'indexes' => array(
diff --git a/View/Elements/payments_modal.ctp b/View/Elements/payments_modal.ctp
index 731fb2b..b53d894 100755
--- a/View/Elements/payments_modal.ctp
+++ b/View/Elements/payments_modal.ctp
@@ -65,7 +65,7 @@
             </div>
           <?php } ?>
           <?php if(!empty($nano_offers)) { ?>
-            <a class="btn btn-info btn-block" data-toggle="collapse" href="#Nano" aria-expanded="false" aria-controls="Nano">Nano</a>
+            <a class="btn btn-info btn-block" data-toggle="collapse" href="#Nano" aria-expanded="false" aria-controls="Nano"><img class="logo" src="https://www.nano.org/assets/img/logo-ea2a79cb5e4d0db90d60eba5a004f77f57bfe9ed0a74eb79fbb3f420da8c7d14.svg" alt="nano" width="100"></a>
             <br>
             <div class="collapse" id="Nano">
               <form>
diff --git a/View/Payment/admin_index.ctp b/View/Payment/admin_index.ctp
index c1bddbc..3c26ac9 100755
--- a/View/Payment/admin_index.ctp
+++ b/View/Payment/admin_index.ctp
@@ -18,7 +18,7 @@ table tr td:last-child > div.btn-group {
 
           <div class="nav-tabs-custom">
             <ul class="nav nav-tabs">
-              <li class="active"><a href="#tab_nano" data-toggle="tab" aria-expanded="false">Nano <img height="10px;" src="https://raw.githubusercontent.com/Joohansson/nanolinks/master/src/nano.gif" alt="Nano GIF"></a></li>
+              <li class="active"><a href="#tab_nano" data-toggle="tab" aria-expanded="false"><img class="logo" src="https://www.nano.org/assets/img/logo-ea2a79cb5e4d0db90d60eba5a004f77f57bfe9ed0a74eb79fbb3f420da8c7d14.svg" alt="nano" width="100"></a></li>
               <li class=""><a href="#tab_starpass" data-toggle="tab" aria-expanded="true">StarPass</a></li>
               <li class=""><a href="#tab_paypal" data-toggle="tab" aria-expanded="false">PayPal</a></li>
               <li class=""><a href="#tab_psc" data-toggle="tab" aria-expanded="false">PaySafeCard</a></li>
@@ -78,10 +78,10 @@ table tr td:last-child > div.btn-group {
                 <table class="table table-bordered dataTable" id="histories_nano">
                   <thead>
                     <tr>
-                      <th><?= $Lang->get('SHOP__NANO_PAYMENT_ID') ?></th>
                       <th><?= $Lang->get('USER__USERNAME') ?></th>
                       <th><?= $Lang->get('SHOP__NANO_OFFER') ?></th>
                       <th><?= $Lang->get('SHOP__GLOBAL_AMOUNT') ?></th>
+                      <th><?= $Lang->get('SHOP__ITEM_CURRENCY') ?></th>
                       <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
                       <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
                     </tr>
@@ -91,26 +91,26 @@ table tr td:last-child > div.btn-group {
                 </table>
                 <script type="text/javascript">
                 $(document).ready(function() {
-                  // $('#histories_nano').DataTable({
-                  //   "paging": true,
-                  //   "lengthChange": false,
-                  //   "searching": false,
-                  //   "ordering": false,
-                  //   "info": false,
-                  //   "autoWidth": false,
-                  //   'searching': true,
-                  //   "bProcessing": true,
-                  //   "bServerSide": true,
-                  //   "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_nano_histories')) ?>",
-                  //   "aoColumns": [
-                  //       {mData:"NanoHistory.block_hash"},
-                  //       {mData:"User.pseudo"},
-                  //       {mData:"Nano.name"},
-                  //       {mData:"NanoHistory.payment_amount"},
-                  //       {mData:"NanoHistory.credits_gived"},
-                  //       {mData:"NanoHistory.created"}
-                  //   ],
-                  // });
+                  $('#histories_nano').DataTable({
+                    "paging": true,
+                    "lengthChange": false,
+                    "searching": false,
+                    "ordering": false,
+                    "info": false,
+                    "autoWidth": false,
+                    'searching': true,
+                    "bProcessing": true,
+                    "bServerSide": true,
+                    "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_nano_histories')) ?>",
+                    "aoColumns": [
+                        {mData:"User.pseudo"},
+                        {mData:"Nano.name"},
+                        {mData:"NanoHistory.payment_amount"},
+                        {mData:"NanoHistory.currency"},
+                        {mData:"NanoHistory.credits_gived"},
+                        {mData:"NanoHistory.created"}
+                    ],
+                  });
                 });
                 </script>
 
diff --git a/lang/en_US.json b/lang/en_US.json
index ff83683..a7ac0d3 100755
--- a/lang/en_US.json
+++ b/lang/en_US.json
@@ -204,7 +204,6 @@
 		"SHOP__NANO_OFFER_EDIT": "Modify a Nano offer",
 		"SHOP__NANO_OFFER_EDIT_SUCCESS": "Nano Offer Changed Successfully!",
 		"SHOP__NANO_OFFER_DELETE_SUCCESS": "The Nano offer has been deleted!",
-		"SHOP__NANO_PAYMENT_ID": "Block Hash",
 		"SHOP__ERROR_NANO_ADDRESS_NOT_VALID":"The Nano address in invalid!",
 		"SHOP__OFFER_MONEY_TO_ADD": "How many {MONEY_NAME} do you want to give?",
 
diff --git a/lang/fr_FR.json b/lang/fr_FR.json
index 613a441..1a3a997 100755
--- a/lang/fr_FR.json
+++ b/lang/fr_FR.json
@@ -203,7 +203,6 @@
   "SHOP__NANO_OFFER_EDIT": "Modifier une offre Nano",
   "SHOP__NANO_OFFER_EDIT_SUCCESS": "Offre Nano modifi\u00e9e avec succ\u00e8s !",
   "SHOP__NANO_OFFER_DELETE_SUCCESS": "L'offre Nano \u00e0 bien \u00e9t\u00e9 supprim\u00e9e !",
-  "SHOP__NANO_PAYMENT_ID": "Block Hash",
   "SHOP__ERROR_NANO_ADDRESS_NOT_VALID":"L'adresse Nano n'est pas valide !",
   "SHOP__OFFER_MONEY_TO_ADD": "Combien de {MONEY_NAME} voulez-vous donner ?",
 

From 59681d9b221ccdb899135a85962fbf525cfd695b Mon Sep 17 00:00:00 2001
From: Javdu10 <jav.valentin@gmail.com>
Date: Thu, 31 Oct 2019 19:53:31 +0100
Subject: [PATCH 21/45] bumping version

---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.json b/config.json
index 1ada284..5742dc3 100755
--- a/config.json
+++ b/config.json
@@ -37,7 +37,7 @@
 		"Boutique": "/shop"
 	},
 	"author":"Eywek",
-	"version":"1.2.15",
+	"version":"1.2.16",
 	"useEvents":true,
 	"permissions" : {
 		"available" : ["CREDIT_ACCOUNT", "CAN_BUY", "SHOP__ADMIN_MANAGE_ITEMS", "SHOP__ADMIN_MANAGE_CATEGORIES", "SHOP__ADMIN_MANAGE_VOUCHERS", "SHOP__ADMIN_MANAGE_PAYMENT", "SHOP__ADMIN_GIFTALL"],

From bedf4b54482dda32246d6ced771e2c9d0c1dff15 Mon Sep 17 00:00:00 2001
From: Javdu10 <jav.valentin@gmail.com>
Date: Fri, 1 Nov 2019 08:31:03 +0100
Subject: [PATCH 22/45] format

---
 Controller/PaymentController.php | 176 +++++++++++++++----------------
 Controller/ShopController.php    |  89 ++++++++--------
 lang/en_US.json                  |   1 -
 3 files changed, 130 insertions(+), 136 deletions(-)

diff --git a/Controller/PaymentController.php b/Controller/PaymentController.php
index 9a04faf..7732966 100755
--- a/Controller/PaymentController.php
+++ b/Controller/PaymentController.php
@@ -702,16 +702,15 @@ public function admin_edit_paypal_ajax($id = false)
       * ======== Ajout d'une offre Nano (affichage) ===========
       */
 
-      public function admin_add_nano()
-      {
-          if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_PAYMENT')) {
-  
-              $this->set('title_for_layout', $this->Lang->get('SHOP__NANO_OFFER_ADD'));
-              $this->layout = 'admin';
-          } else {
-              $this->redirect('/');
-          }
-      }
+    public function admin_add_nano()
+    {
+        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_PAYMENT')) {
+            $this->set('title_for_layout', $this->Lang->get('SHOP__NANO_OFFER_ADD'));
+            $this->layout = 'admin';
+        } else {
+            $this->redirect('/');
+        }
+    }
 
     /*
     * ======== Ajout d'une offre Nano (Traitement AJAX) ===========
@@ -1215,25 +1214,25 @@ public function ipn()
       * ======== Vérification d'une transaction Nano ===========
       */
 
-      public function verif_brainblocks()
-      { // cf. https://brainblocks.io/
-          $this->autoRender = false;
+    public function verif_brainblocks()
+    { // cf. https://brainblocks.io/
+        $this->autoRender = false;
   
-          if ($this->request->is('post')) { //On vérifie l'état de la requête
+        if ($this->request->is('post')) { //On vérifie l'état de la requête
   
-              // On assigne les variables
-              $token = $this->request->data['token'];
-              $user_id = $this->request->data['user_id'];
-              $nano_id = $this->request->data['nano_id'];
-              // On vérifie que l'utilisateur contenu dans le champ custom existe bien
+            // On assigne les variables
+            $token = $this->request->data['token'];
+            $user_id = $this->request->data['user_id'];
+            $nano_id = $this->request->data['nano_id'];
+            // On vérifie que l'utilisateur contenu dans le champ nano_id existe bien
   
-              $this->loadModel('User');
-              if (!$this->User->exist($user_id)) {
-                  throw new InternalErrorException('Nano : Unknown user');
-              }
+            $this->loadModel('User');
+            if (!$this->User->exist($user_id)) {
+                throw new InternalErrorException('Nano : Unknown user');
+            }
   
-              // On prépare la requête de vérification
-              // On fais la requête
+            // On prépare la requête de vérification
+            // On fais la requête
   
               $cURL = curl_init();
               curl_setopt($cURL, CURLOPT_SSL_VERIFYPEER, false);
@@ -1257,88 +1256,83 @@ public function verif_brainblocks()
               $Status = (int)curl_getinfo($cURL, CURLINFO_HTTP_CODE);
               curl_close($cURL);
   
-              // On traite la réponse
+            // On traite la réponse
               
-              // On vérifie que il y ai pas eu d'erreur
+            // On vérifie que il y ai pas eu d'erreur
   
-              if (empty($Response) || $Status != 200 || !$Status) {
-                  throw new InternalErrorException('Nano : Error with BrainBlocks Response');
-              }
+            if (empty($Response) || $Status != 200 || !$Status) {
+                throw new InternalErrorException('Nano : Error with BrainBlocks Response');
+            }
               $result = json_decode($Response, true);
   
-              // On effectue les autres vérifications
+            // On effectue les autres vérifications
 
-                      // On cherche l'offre avec ce montant là
-                      $this->loadModel('Shop.Nano');
-                      $findOffer = $this->Nano->find('first', array('conditions' => array('id' => $nano_id)));
-                      if (!empty($findOffer)) {
-  
-                          // On vérifie que ce soit le bon mail
-                          if ($result['destination'] == $findOffer['Nano']['address'] 
-                              && $result['currency'] == $findOffer['Nano']['currency'] && $result['amount'] == $findOffer['Nano']['price']
-                              && $result['fulfilled'] == true) {
-  
-                              // On vérifie que le paiement pas déjà en base de données
-                              $this->loadModel('Shop.NanoHistory');
-                              $findPayment = $this->NanoHistory->find('first', array('conditions' => array('token' => $token)));
-  
-                              if (empty($findPayment)) {
-  
-                                  // On récupére le solde de l'utilisateur et on ajoute ses nouveaux crédits
-                                  $sold = $this->User->getFromUser('money', $user_id);
-                                  $new_sold = floatval($sold + floatval($findOffer['Nano']['money']));
-  
-                                  // On ajoute l'argent à l'utilisateur
-                                  $this->User->setToUser('money', $new_sold, $user_id);
+            // On cherche l'offre avec sont id
+            $this->loadModel('Shop.Nano');
+            $findOffer = $this->Nano->find('first', array('conditions' => array('id' => $nano_id)));
+            if (!empty($findOffer)) {
+                // On vérifie que toutes les conditions ont ete remplis
+                if ($result['destination'] == $findOffer['Nano']['address']     // si l'adresse de destination de Brainblocks corresponds a notre addresse de destination
+                    && $result['currency'] == $findOffer['Nano']['currency']    // si l'equivalence a bien ete calcule avec la monnaie FIAT choisis
+                    && $result['amount'] == $findOffer['Nano']['price']         // si le prix paye corresponds au prix de l'offre
+                    && $result['fulfilled'] == true) {                          // si le paiement est complet. s'il ne l'est pas, 
+                                                                                //apres 20 minutes les cryptomonnaies de l'utilisateur lui seront retourne
+                    // On vérifie que le paiement n'est pas déjà en base de données
+                    $this->loadModel('Shop.NanoHistory');
+                    $findPayment = $this->NanoHistory->find('first', array('conditions' => array('token' => $token)));
   
-                                  // On l'ajoute dans l'historique global
-                                  $this->HistoryC = $this->Components->load('History');
-                                  $this->HistoryC->set('BUY_MONEY', 'shop', null, $user_id);
+                    if (empty($findPayment)) {
   
-                                  // On l'ajoute dans l'historique des paiements
-                                  $this->NanoHistory->create();
-                                  $this->NanoHistory->set(array(
-                                      'token' => $token,
-                                      'user_id' => $user_id,
-                                      'offer_id' => $findOffer['Nano']['id'],
-                                      'payment_amount' => $findOffer['Nano']['price'],
-                                      'currency' => $findOffer['Nano']['currency'],
-                                      'credits_gived' => $findOffer['Nano']['money']
-                                  ));
-                                  $this->NanoHistory->save();
+                        // On récupére le solde de l'utilisateur et on ajoute ses nouveaux crédits
+                        $sold = $this->User->getFromUser('money', $user_id);
+                        $new_sold = floatval($sold + floatval($findOffer['Nano']['money']));
   
-                                  $event = new CakeEvent('onBuyPoints', $this, array('credits' => $findOffer['Nano']['money'], 'price' => $findOffer['Nano']['price'], 'plateform' => 'nano', 'user_id' => $user_id));
-                                  $this->getEventManager()->dispatch($event);
-                                  if ($event->isStopped()) {
-                                      return $event->result;
-                                  }
+                        // On ajoute l'argent à l'utilisateur
+                        $this->User->setToUser('money', $new_sold, $user_id);
   
-                                  $this->loadModel('Notification');
-                                  $this->Notification->setToUser($this->Lang->get('NOTIFICATION__NANO_VALIDED'), $user_id);
+                        // On l'ajoute dans l'historique global
+                        $this->HistoryC = $this->Components->load('History');
+                        $this->HistoryC->set('BUY_MONEY', 'shop', null, $user_id);
   
-                                  $this->response->statusCode(200);
-                                  echo json_encode(array('statut' => true, 'msg' => $this->Lang->get('NOTIFICATION__NANO_VALIDED')));
+                        // On l'ajoute dans l'historique des paiements
+                        $this->NanoHistory->create();
+                        $this->NanoHistory->set(array(
+                            'token' => $token,
+                            'user_id' => $user_id,
+                            'offer_id' => $findOffer['Nano']['id'],
+                            'payment_amount' => $findOffer['Nano']['price'],
+                            'currency' => $findOffer['Nano']['currency'],
+                            'credits_gived' => $findOffer['Nano']['money']
+                        ));
+                        $this->NanoHistory->save();
   
-                              } else {
-                                  throw new InternalErrorException('Nano : Payment already credited');
-                              }
+                        $event = new CakeEvent('onBuyPoints', $this, array('credits' => $findOffer['Nano']['money'], 'price' => $findOffer['Nano']['price'], 'plateform' => 'nano', 'user_id' => $user_id));
+                        $this->getEventManager()->dispatch($event);
+                        if ($event->isStopped()) {
+                            return $event->result;
+                        }
   
-                          } else {
-                              throw new InternalErrorException('Nano : invalid address');
-                          }
+                        $this->loadModel('Notification');
+                        $this->Notification->setToUser($this->Lang->get('NOTIFICATION__NANO_VALIDED'), $user_id);
   
-                      } else {
-                          throw new InternalErrorException('Nano : Unknown offer');
-                      }
+                        $this->response->statusCode(200);
+                        echo json_encode(array('statut' => true, 'msg' => $this->Lang->get('NOTIFICATION__NANO_VALIDED')));
   
-                  
+                    } else {
+                        throw new InternalErrorException('Nano : Payment already credited');
+                    }
   
-              
+                } else {
+                    throw new InternalErrorException('Nano : invalid address');
+                }
   
-          } else {
-              throw new InternalErrorException('Nano : Not post');
-          }
-      }
+            } else {
+                throw new InternalErrorException('Nano : Unknown offer');
+            }
+        } else {
+            throw new InternalErrorException('Nano : Not post');
+        }
+    }
 
 
     /*
diff --git a/Controller/ShopController.php b/Controller/ShopController.php
index 7b78fdf..387da23 100755
--- a/Controller/ShopController.php
+++ b/Controller/ShopController.php
@@ -20,52 +20,53 @@ function index($category = false)
         $this->layout = $this->Configuration->getKey('layout'); // On charge le thème configuré
         $this->loadModel('Shop.Item'); // le model des articles
         $this->loadModel('Shop.Category'); // le model des catégories
-        $search_items = $this->Item->find('all', array(
-			'order' => 'order',
+        $search_items = $this->Item->find('all',
+          array(
+            'order' => 'order',
             'conditions' => array(
                 'OR' => array(
-                    'display IS NULL',
-                    'display = 1'
-                )
-            )
-        )); // on cherche tous les items et on envoie à la vue
-	$vanow = 0;
-	$this->loadModel('Shop.DedipassHistory');
-    $this->loadModel('Shop.PaypalHistory');
-    $this->loadModel('Shop.NanoHistory');
-	$this->loadModel('Shop.StarpassHistory');
-	$this->loadModel('Shop.PaysafecardHistory');
-	$histories_dedi = $this->DedipassHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
-    $histories_paypal = $this->PaypalHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
-    $histories_nano = $this->NanoHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
-	$histories_pay = $this->PaysafecardHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
-	$histories_star = $this->StarpassHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
-	foreach ($histories_dedi as $value){
-		$vanow +=  floatval($value["DedipassHistory"]["credits_gived"]);
-	}
-	foreach ($histories_paypal as $value){
-		$vanow +=  floatval($value["PaypalHistory"]["payment_amount"]);
-    }
-    foreach ($histories_nano as $value){
-		$vanow +=  floatval($value["NanoHistory"]["payment_amount"]);
-	}
-	foreach ($histories_pay as $value){
-		$vanow +=  floatval($value["PaysafecardHistory"]["credits_gived"]);
-	}
-	foreach ($histories_star as $value){
-		$vanow +=  floatval($value["StarpassHistory"]["credits_gived"]);
-	}
-	$this->loadModel('Shop.ItemsConfig');
-	$vagoal = $this->ItemsConfig->find('all');
-	$vagoal = @$vagoal[0]["ItemsConfig"]["goal"];
-	if ($vanow > $vagoal){
-		$vanow = $vagoal;
-	}
-	if ($vagoal != 0){
-		$vawidth = round((str_replace(",", '.', $vanow*100/$vagoal)));
-	}
-	    
-	$best_donator_price = array();
+                  'display IS NULL',
+                  'display = 1'
+                  )
+              )
+            )); // on cherche tous les items et on envoie à la vue
+        $vanow = 0;
+        $this->loadModel('Shop.DedipassHistory');
+        $this->loadModel('Shop.PaypalHistory');
+        $this->loadModel('Shop.NanoHistory');
+        $this->loadModel('Shop.StarpassHistory');
+        $this->loadModel('Shop.PaysafecardHistory');
+        $histories_dedi = $this->DedipassHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
+        $histories_paypal = $this->PaypalHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
+        $histories_nano = $this->NanoHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
+        $histories_pay = $this->PaysafecardHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
+        $histories_star = $this->StarpassHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
+        foreach ($histories_dedi as $value){
+          $vanow +=  floatval($value["DedipassHistory"]["credits_gived"]);
+        }
+        foreach ($histories_paypal as $value){
+          $vanow +=  floatval($value["PaypalHistory"]["payment_amount"]);
+        }
+        foreach ($histories_nano as $value){
+          $vanow +=  floatval($value["NanoHistory"]["payment_amount"]);
+        }
+        foreach ($histories_pay as $value){
+          $vanow +=  floatval($value["PaysafecardHistory"]["credits_gived"]);
+        }
+        foreach ($histories_star as $value){
+          $vanow +=  floatval($value["StarpassHistory"]["credits_gived"]);
+        }
+        $this->loadModel('Shop.ItemsConfig');
+        $vagoal = $this->ItemsConfig->find('all');
+        $vagoal = @$vagoal[0]["ItemsConfig"]["goal"];
+        if ($vanow > $vagoal){
+          $vanow = $vagoal;
+        }
+        if ($vagoal != 0){
+          $vawidth = round((str_replace(",", '.', $vanow*100/$vagoal)));
+        }
+            
+        $best_donator_price = array();
 
         foreach($histories_dedi as $get) {
             $best_donator_price[$get["DedipassHistory"]["user_id"]] += $get["DedipassHistory"]["credits_gived"];
diff --git a/lang/en_US.json b/lang/en_US.json
index a7ac0d3..f6079f2 100755
--- a/lang/en_US.json
+++ b/lang/en_US.json
@@ -121,7 +121,6 @@
 		"SHOP__ITEM_NAME": "Name",
 		"SHOP__ITEM_IMG_URL": "URL of the image",
 		"SHOP__ITEM_PRICE": "Price",
-		"SHOP__ITEM_CURRNCY": "Currency",
 		"SHOP__ITEM_QUANTITY": "Quantity",
 		"SHOP__ITEM_TOTAL": "Total",
 		"SHOP__ITEM_DESCRIPTION": "Description",

From cff65a9b11c165f3a6e1b341cdc75d49847586a9 Mon Sep 17 00:00:00 2001
From: Javdu10 <jav.valentin@gmail.com>
Date: Fri, 1 Nov 2019 09:03:23 +0100
Subject: [PATCH 23/45] show ajax-msg

---
 View/Elements/payments_modal.ctp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/View/Elements/payments_modal.ctp b/View/Elements/payments_modal.ctp
index b53d894..df77990 100755
--- a/View/Elements/payments_modal.ctp
+++ b/View/Elements/payments_modal.ctp
@@ -69,6 +69,7 @@
             <br>
             <div class="collapse" id="Nano">
               <form>
+                <div class="ajax-msg"></div>
                 <script src="https://brainblocks.io/brainblocks.min.js"></script>
                 
                 <script>
@@ -94,11 +95,15 @@
                             contentType: false,
                             dataType : 'json',     
                             success : function(res){ 
-                                if(res.statut)
-                                  window.location.reload()
+                                if(res.statut){
+                                  $('#Nano').find('.ajax-msg').html('<div class="alert alert-success">'+res.msg+'</div>').fadeIn('150');
+                                }else{
+                                  $('#Nano').find('.ajax-msg').html('<div class="alert alert-danger">ERROR : '+res.msg+'</div>').fadeIn('150');
+                                }
+                                  
                             },
                             error: function(res){
-                                console.log(res);
+                              $('#Nano').find('.ajax-msg').html('<div class="alert alert-danger">ERROR : '+res.msg+'</div>').fadeIn('150');
                             }
                         });
                         

From e7624b51d0d81fe274be4b03cf0d243c1c018ad2 Mon Sep 17 00:00:00 2001
From: Javdu10 <jav.valentin@gmail.com>
Date: Sat, 2 Nov 2019 00:37:31 +0100
Subject: [PATCH 24/45] add a "Getting Started"

---
 View/Payment/admin_add_nano.ctp | 2 +-
 View/Payment/admin_index.ctp    | 8 +++++++-
 lang/en_US.json                 | 6 +++++-
 lang/fr_FR.json                 | 6 +++++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/View/Payment/admin_add_nano.ctp b/View/Payment/admin_add_nano.ctp
index 118c3ba..d9b80f6 100644
--- a/View/Payment/admin_add_nano.ctp
+++ b/View/Payment/admin_add_nano.ctp
@@ -16,7 +16,7 @@
             </div>
 
             <div class="form-group">
-              <label><?= "nano_..."//$Lang->get('USER__EMAIL') ?></label>
+              <label><?= "nano_..."?></label>
               <input name="address" class="form-control" type="text">
             </div>
 
diff --git a/View/Payment/admin_index.ctp b/View/Payment/admin_index.ctp
index 3c26ac9..7a444bd 100755
--- a/View/Payment/admin_index.ctp
+++ b/View/Payment/admin_index.ctp
@@ -35,7 +35,13 @@ table tr td:last-child > div.btn-group {
                 <h3><?= $Lang->get('SHOP__NANO_OFFERS') ?> <a href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'add_nano', 'admin' => true)) ?>" class="btn btn-success pull-right"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
 
                 <br>
-                
+                <div class="alert alert-info">
+                  <p>
+                    <?= $Lang->get('SHOP__NANO_EXPLAIN_CONFIG_1') ?><a target="_blank" href="https://app.brainblocks.io"><b>Brainblocks</b></a><?= $Lang->get('SHOP__NANO_EXPLAIN_CONFIG_2') ?><a target="_blank" href="https://natrium.io"><b>Natrium</b></a>
+                  </p>
+                  <p><?= $Lang->get('SHOP__NANO_EXPLAIN_CONFIG_3') ?><a target="_blank" href="https://www.youtube.com/watch?v=ydVomoXEGe0"><b>YouTube (English)</b></a></p>
+                  <p><?= $Lang->get('SHOP__NANO_EXPLAIN_CONFIG_4') ?><a target="_blank" href="https://www.nano.org/"><b>Nano.org</b></a></p>
+                </div>
 
                 <table class="table table-bordered">
                   <thead>
diff --git a/lang/en_US.json b/lang/en_US.json
index f6079f2..8b7ee80 100755
--- a/lang/en_US.json
+++ b/lang/en_US.json
@@ -157,7 +157,7 @@
 		"SHOP__ITEM_WAIT_TIME": "Time interval between purchases",
 		"SHOP__ITEM_CANT_BUY_WAIT_TIME": "You can not buy item <i> {ITEM_NAME} </ i> now! Every purchase must be spaced from {WAIT_TIME}.",
         "SHOP__ITEMS_AVAILABLE_OTHER":"Items not listed",
-		"SHOP__ITEM_CURRENCY":"Currency",
+		"SHOP__ITEM_CURRENCY":"Currency (EUR, USD...)",
 		"SHOP__CATEGORIES": "Categories",
 		"SHOP__CATEGORY": "Category",
 		"SHOP__CATEGORY_ADD": "Add a category",
@@ -204,6 +204,10 @@
 		"SHOP__NANO_OFFER_EDIT_SUCCESS": "Nano Offer Changed Successfully!",
 		"SHOP__NANO_OFFER_DELETE_SUCCESS": "The Nano offer has been deleted!",
 		"SHOP__ERROR_NANO_ADDRESS_NOT_VALID":"The Nano address in invalid!",
+		"SHOP__NANO_EXPLAIN_CONFIG_1":"To start, you need a wallet either on : ",
+		"SHOP__NANO_EXPLAIN_CONFIG_2":" or with the mobile application ",
+		"SHOP__NANO_EXPLAIN_CONFIG_3":"A short introduction of Nano is available on ",
+		"SHOP__NANO_EXPLAIN_CONFIG_4":"You can have more informations on ",
 		"SHOP__OFFER_MONEY_TO_ADD": "How many {MONEY_NAME} do you want to give?",
 
 		"SHOP__STARPASS_OFFERS": "StarPass Offers",
diff --git a/lang/fr_FR.json b/lang/fr_FR.json
index 1a3a997..a359845 100755
--- a/lang/fr_FR.json
+++ b/lang/fr_FR.json
@@ -121,7 +121,7 @@
   "SHOP__ITEM_NAME":"Nom",
   "SHOP__ITEM_IMG_URL": "URL de l'image",
   "SHOP__ITEM_PRICE": "Prix",
-  "SHOP__ITEM_CURRENCY": "Monnaie",
+  "SHOP__ITEM_CURRENCY": "Monnaie (EUR, USD...)",
   "SHOP__ITEM_QUANTITY":"Quantité",
   "SHOP__ITEM_TOTAL":"Total",
   "SHOP__ITEM_DESCRIPTION": "Description",
@@ -204,6 +204,10 @@
   "SHOP__NANO_OFFER_EDIT_SUCCESS": "Offre Nano modifi\u00e9e avec succ\u00e8s !",
   "SHOP__NANO_OFFER_DELETE_SUCCESS": "L'offre Nano \u00e0 bien \u00e9t\u00e9 supprim\u00e9e !",
   "SHOP__ERROR_NANO_ADDRESS_NOT_VALID":"L'adresse Nano n'est pas valide !",
+  "SHOP__NANO_EXPLAIN_CONFIG_1":"Pour commencer, il faut un portefeuille Nano soit sur : ",
+  "SHOP__NANO_EXPLAIN_CONFIG_2":" ou encore avec l'application ",
+  "SHOP__NANO_EXPLAIN_CONFIG_3":"Une courte vid\u00e9o d'introduction sur Nano est disponible sur ",
+  "SHOP__NANO_EXPLAIN_CONFIG_4":"Vous pouvez avoir plus d'informations sur ",
   "SHOP__OFFER_MONEY_TO_ADD": "Combien de {MONEY_NAME} voulez-vous donner ?",
 
   "SHOP__STARPASS_OFFERS": "Offres StarPass",

From 3751ef055feed06cd2be429029f54b757440c00a Mon Sep 17 00:00:00 2001
From: Javdu10 <jav.valentin@gmail.com>
Date: Sat, 2 Nov 2019 00:47:08 +0100
Subject: [PATCH 25/45] fix brainblocks duplication button

---
 View/Elements/payments_modal.ctp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/View/Elements/payments_modal.ctp b/View/Elements/payments_modal.ctp
index df77990..1bc4142 100755
--- a/View/Elements/payments_modal.ctp
+++ b/View/Elements/payments_modal.ctp
@@ -74,6 +74,7 @@
                 
                 <script>
                   function renderBrainblocks(select){
+                    $('#nano-button').html('')
                     var val = $(select).val()
                     var amount_address_currency = val.split('|')
                     brainblocks.Button.render({

From efd07016b21758e6850ecf467cd70eb2840f49d2 Mon Sep 17 00:00:00 2001
From: Javdu10 <jav.valentin@gmail.com>
Date: Sat, 2 Nov 2019 01:02:42 +0100
Subject: [PATCH 26/45] change points without reloading the page

---
 Controller/PaymentController.php | 2 +-
 View/Elements/payments_modal.ctp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Controller/PaymentController.php b/Controller/PaymentController.php
index 7732966..a114582 100755
--- a/Controller/PaymentController.php
+++ b/Controller/PaymentController.php
@@ -1316,7 +1316,7 @@ public function verif_brainblocks()
                         $this->Notification->setToUser($this->Lang->get('NOTIFICATION__NANO_VALIDED'), $user_id);
   
                         $this->response->statusCode(200);
-                        echo json_encode(array('statut' => true, 'msg' => $this->Lang->get('NOTIFICATION__NANO_VALIDED')));
+                        echo json_encode(array('statut' => true, 'msg' => $this->Lang->get('NOTIFICATION__NANO_VALIDED'), 'money'=>"$new_sold ".(($new_sold > 1 ? $this->Configuration->getMoneyName() : $this->Configuration->getMoneyName(false)))));
   
                     } else {
                         throw new InternalErrorException('Nano : Payment already credited');
diff --git a/View/Elements/payments_modal.ctp b/View/Elements/payments_modal.ctp
index 1bc4142..5c88c92 100755
--- a/View/Elements/payments_modal.ctp
+++ b/View/Elements/payments_modal.ctp
@@ -98,6 +98,7 @@
                             success : function(res){ 
                                 if(res.statut){
                                   $('#Nano').find('.ajax-msg').html('<div class="alert alert-success">'+res.msg+'</div>').fadeIn('150');
+                                  $('body > div.container.plugin-shop > div > div.col-xs-12.col-md-3 > p').html(res.money)
                                 }else{
                                   $('#Nano').find('.ajax-msg').html('<div class="alert alert-danger">ERROR : '+res.msg+'</div>').fadeIn('150');
                                 }

From 9bba6b4792317fc0e372625a85398754f36f0180 Mon Sep 17 00:00:00 2001
From: Javdu10 <jav.valentin@gmail.com>
Date: Wed, 13 Nov 2019 13:50:24 +0100
Subject: [PATCH 27/45] fix: nano payment

---
 Controller/PaymentController.php | 15 ++++++++-----
 Controller/ShopController.php    |  8 ++++++-
 Model/Nano.php                   | 38 +++++++++++++++++++++++++++++++-
 View/Elements/payments_modal.ctp | 11 ++++++++-
 View/Payment/admin_index.ctp     | 11 ++++++++-
 View/Shop/index.ctp              |  2 +-
 config.json                      |  2 +-
 7 files changed, 76 insertions(+), 11 deletions(-)

diff --git a/Controller/PaymentController.php b/Controller/PaymentController.php
index a114582..a81e772 100755
--- a/Controller/PaymentController.php
+++ b/Controller/PaymentController.php
@@ -42,11 +42,16 @@ public function admin_index()
             }
 
             $this->loadModel('Shop.Nano');
-            $offers['nano'] = $this->Nano->find('all');
-
-            foreach ($offers['nano'] as $key => $value) {
-                $offersByID['nano'][$value['Nano']['id']] = $value['Nano']['name'];
-            }
+            try {
+                // si le plugin est update de x.x.15 a x.x.16 ca throw une execption
+                $offers['nano'] = $this->Nano->find('all');
+                foreach ($offers['nano'] as $key => $value) {
+                    $offersByID['nano'][$value['Nano']['id']] = $value['Nano']['name'];
+                }
+            } catch (\Throwable $th) {
+                // ici on cree les tables necessaires et on redirige sur l'index ud controller
+                $this->Nano->init($this);
+            }  
 
             // Les PaySafeCards c'est différents
 
diff --git a/Controller/ShopController.php b/Controller/ShopController.php
index 387da23..f614dac 100755
--- a/Controller/ShopController.php
+++ b/Controller/ShopController.php
@@ -38,7 +38,13 @@ function index($category = false)
         $this->loadModel('Shop.PaysafecardHistory');
         $histories_dedi = $this->DedipassHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
         $histories_paypal = $this->PaypalHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
-        $histories_nano = $this->NanoHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
+        $this->loadModel('Shop.Nano');
+        try {           
+            $nano_offers = $this->Nano->find('all');
+            $histories_nano = $this->NanoHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
+        } catch (\Throwable $th) {
+            $this->Nano->init($this);
+        }
         $histories_pay = $this->PaysafecardHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
         $histories_star = $this->StarpassHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
         foreach ($histories_dedi as $value){
diff --git a/Model/Nano.php b/Model/Nano.php
index cd50bee..c65e4fe 100644
--- a/Model/Nano.php
+++ b/Model/Nano.php
@@ -1,2 +1,38 @@
 <?php
-class Nano extends ShopAppModel {}
+class Nano extends ShopAppModel {
+    public function init($controller){
+        $db = ConnectionManager::getDataSource('default');
+                if( !in_array('nanos', $db->listSources()) ){
+                    $this->query("CREATE TABLE IF NOT EXISTS `shop__nanos` (
+                        `id` int(20) NOT NULL AUTO_INCREMENT,
+                        `address` varchar(65) NOT NULL,
+                        `name` varchar(50) NOT NULL,
+                       `price` varchar(20) NOT NULL,
+                        `currency` varchar(3) DEFAULT NULL,
+                        `money` varchar(20) NOT NULL,
+                        `created` datetime NOT NULL,
+                        PRIMARY KEY (`id`)
+                   ) ENGINE=InnoDB DEFAULT CHARSET=latin1");
+                    $this->query("CREATE TABLE IF NOT EXISTS `shop__nano_histories` (
+                        `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+                        `token` varchar(300) NOT NULL,
+                        `user_id` int(11) NOT NULL,
+                        `offer_id` int(11) NOT NULL,
+                        `payment_amount` varchar(20) NOT NULL,
+                        `currency` varchar(3) DEFAULT NULL,
+                        `credits_gived` varchar(10) DEFAULT NULL,
+                        `created` datetime NOT NULL,
+                        PRIMARY KEY (`id`),
+                        UNIQUE KEY `U_token` (`token`)
+                    ) ENGINE=InnoDB DEFAULT CHARSET=latin1");
+                }
+                // puis on clear le cache
+                App::uses('Folder', 'Utility');
+                $folder = new Folder(ROOT . DS . 'app' . DS . 'tmp' . DS . 'cache');
+                if (!empty($folder->path)) {
+                    $folder->delete();
+                }
+                // et on redirige sur la meme page comme si de rien etait
+                $controller->redirect(array('action' => 'index'));
+    }
+}
\ No newline at end of file
diff --git a/View/Elements/payments_modal.ctp b/View/Elements/payments_modal.ctp
index 5c88c92..999a47d 100755
--- a/View/Elements/payments_modal.ctp
+++ b/View/Elements/payments_modal.ctp
@@ -65,7 +65,16 @@
             </div>
           <?php } ?>
           <?php if(!empty($nano_offers)) { ?>
-            <a class="btn btn-info btn-block" data-toggle="collapse" href="#Nano" aria-expanded="false" aria-controls="Nano"><img class="logo" src="https://www.nano.org/assets/img/logo-ea2a79cb5e4d0db90d60eba5a004f77f57bfe9ed0a74eb79fbb3f420da8c7d14.svg" alt="nano" width="100"></a>
+            <a class="btn btn-info btn-block" data-toggle="collapse" href="#Nano" aria-expanded="false" aria-controls="Nano">
+              <svg width="100" viewBox="0 0 210 30" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" class="logo">
+                  <g>
+                    <path fill="black" d="m105.857,2.0836c-0.33,0 -0.604,0.1098 -0.81,0.3429c-0.206,0.2332 -0.302,0.5212 -0.302,0.8779l0,21.9047l-16.706,-22.5494c-0.261,-0.384 -0.59,-0.5761 -0.988,-0.5761c-0.385,0 -0.687,0.1098 -0.906,0.3429c-0.22,0.2332 -0.33,0.5212 -0.33,0.8779l0,24.8811c0,0.3841 0.082,0.6858 0.261,0.9053c0.178,0.2195 0.453,0.3292 0.837,0.3292c0.33,0 0.604,-0.1097 0.81,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-21.946l16.747,22.5906c0.302,0.3841 0.646,0.5761 1.03,0.5761c0.357,0 0.631,-0.1097 0.837,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-24.8812c0,-0.3841 -0.096,-0.6858 -0.288,-0.8916c-0.165,-0.2331 -0.439,-0.3429 -0.796,-0.3429zm87.786,-0.192c-7.605,0 -13.782,6.1723 -13.782,13.7711c0,7.5987 6.177,13.771 13.782,13.771c7.605,0 13.782,-6.1723 13.782,-13.771c0,-7.5851 -6.191,-13.7711 -13.782,-13.7711zm0,25.2927c-6.356,0 -11.531,-5.171 -11.531,-11.5216c0,-6.3506 5.175,-11.5216 11.531,-11.5216c6.355,0 11.531,5.171 11.531,11.5216c0,6.3506 -5.176,11.5216 -11.531,11.5216zm-63.53,-24.2914c-0.096,-0.2606 -0.275,-0.4527 -0.522,-0.6172c-0.247,-0.1509 -0.508,-0.2332 -0.782,-0.2332c-0.618,0 -1.03,0.2743 -1.263,0.8367l-11.174,25.0732c-0.055,0.096 -0.082,0.2468 -0.082,0.4252c0,0.3017 0.109,0.5486 0.329,0.7406c0.22,0.1921 0.481,0.2881 0.783,0.2881c0.48,0 0.837,-0.2469 1.07,-0.727l2.952,-6.6523l14.839,0l2.91,6.6523c0.096,0.2332 0.247,0.4115 0.439,0.535c0.192,0.1234 0.385,0.192 0.591,0.192c0.302,0 0.576,-0.096 0.809,-0.2881c0.234,-0.192 0.344,-0.4252 0.344,-0.6995c0,-0.1509 -0.042,-0.3017 -0.11,-0.4526l-11.133,-25.0732zm-7.811,17.0766l6.534,-14.786l6.507,14.786l-13.041,0zm48.389,-17.8859c-0.33,0 -0.604,0.1098 -0.796,0.3429c-0.206,0.2332 -0.302,0.5212 -0.302,0.8779l0,21.9047l-16.72,-22.5494c-0.261,-0.384 -0.59,-0.5761 -0.989,-0.5761c-0.384,0 -0.686,0.1098 -0.906,0.3429c-0.219,0.2332 -0.329,0.5212 -0.329,0.8779l0,24.8811c0,0.3841 0.082,0.6858 0.261,0.9053c0.178,0.2195 0.453,0.3292 0.837,0.3292c0.33,0 0.604,-0.1097 0.81,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-21.946l16.747,22.5906c0.302,0.3841 0.645,0.5761 1.03,0.5761c0.357,0 0.631,-0.1097 0.837,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-24.8812c0,-0.3841 -0.096,-0.6858 -0.288,-0.8916c-0.165,-0.2331 -0.439,-0.3429 -0.796,-0.3429z"/>
+                    <path fill="#4A90E2" d="m37.701,15.6633c0,2.5238 -2.0453,4.5538 -4.5574,4.5538c-2.5121,0 -4.5575,-2.0438 -4.5575,-4.5538c0,-3.4153 -1.1393,-4.5538 -4.5574,-4.5538c-3.4181,0 -4.5575,1.1385 -4.5575,4.5538c0,2.5238 -2.0453,4.5538 -4.5574,4.5538c-2.5121,0 -4.5575,-2.0438 -4.5575,-4.5538c0,-2.5238 2.0454,-4.5538 4.5575,-4.5538c3.4181,0 4.5574,-1.1384 4.5574,-4.5538c0,-2.5237 2.0454,-4.5537 4.5575,-4.5537c2.5121,0 4.5574,2.0437 4.5574,4.5537c0,3.4154 1.1394,4.5538 4.5575,4.5538c2.5258,0 4.5574,2.0437 4.5574,4.5538z"/>
+                    <path fill="#4A90E2" d="m5.7714,29.338c2.517,0 4.5575,-2.0388 4.5575,-4.5538c0,-2.5149 -2.0405,-4.5537 -4.5575,-4.5537c-2.517,0 -4.5574,2.0388 -4.5574,4.5537c0,2.515 2.0404,4.5538 4.5574,4.5538z"/>
+                    <path fill="#4A90E2" d="m65.087,6.5557c0,2.5238 -2.0454,4.5538 -4.5575,4.5538c-3.4181,0 -4.5574,1.1385 -4.5574,4.5538c0,2.5238 -2.0454,4.5538 -4.5575,4.5538c-3.4181,0 -4.5574,1.1384 -4.5574,4.5537c0,2.5238 -2.0454,4.5538 -4.5575,4.5538c-2.5121,0 -4.5574,-2.0437 -4.5574,-4.5538c0,-2.5237 2.0453,-4.5537 4.5574,-4.5537c3.4181,0 4.5575,-1.1385 4.5575,-4.5538c0,-2.5238 2.0453,-4.5538 4.5574,-4.5538c3.4181,0 4.5575,-1.1384 4.5575,-4.5538c0,-2.5237 2.0453,-4.5537 4.5574,-4.5537c2.5121,0 4.5575,2.03 4.5575,4.5537z"/>
+                  </g>
+              </svg>
+            </a>
             <br>
             <div class="collapse" id="Nano">
               <form>
diff --git a/View/Payment/admin_index.ctp b/View/Payment/admin_index.ctp
index 7a444bd..bd8c16a 100755
--- a/View/Payment/admin_index.ctp
+++ b/View/Payment/admin_index.ctp
@@ -18,7 +18,16 @@ table tr td:last-child > div.btn-group {
 
           <div class="nav-tabs-custom">
             <ul class="nav nav-tabs">
-              <li class="active"><a href="#tab_nano" data-toggle="tab" aria-expanded="false"><img class="logo" src="https://www.nano.org/assets/img/logo-ea2a79cb5e4d0db90d60eba5a004f77f57bfe9ed0a74eb79fbb3f420da8c7d14.svg" alt="nano" width="100"></a></li>
+            <li class="active"><a href="#tab_nano" data-toggle="tab" aria-expanded="false">
+              <svg width="100" viewBox="0 0 210 30" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" class="logo">
+                <g>
+                  <path fill="black" d="m105.857,2.0836c-0.33,0 -0.604,0.1098 -0.81,0.3429c-0.206,0.2332 -0.302,0.5212 -0.302,0.8779l0,21.9047l-16.706,-22.5494c-0.261,-0.384 -0.59,-0.5761 -0.988,-0.5761c-0.385,0 -0.687,0.1098 -0.906,0.3429c-0.22,0.2332 -0.33,0.5212 -0.33,0.8779l0,24.8811c0,0.3841 0.082,0.6858 0.261,0.9053c0.178,0.2195 0.453,0.3292 0.837,0.3292c0.33,0 0.604,-0.1097 0.81,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-21.946l16.747,22.5906c0.302,0.3841 0.646,0.5761 1.03,0.5761c0.357,0 0.631,-0.1097 0.837,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-24.8812c0,-0.3841 -0.096,-0.6858 -0.288,-0.8916c-0.165,-0.2331 -0.439,-0.3429 -0.796,-0.3429zm87.786,-0.192c-7.605,0 -13.782,6.1723 -13.782,13.7711c0,7.5987 6.177,13.771 13.782,13.771c7.605,0 13.782,-6.1723 13.782,-13.771c0,-7.5851 -6.191,-13.7711 -13.782,-13.7711zm0,25.2927c-6.356,0 -11.531,-5.171 -11.531,-11.5216c0,-6.3506 5.175,-11.5216 11.531,-11.5216c6.355,0 11.531,5.171 11.531,11.5216c0,6.3506 -5.176,11.5216 -11.531,11.5216zm-63.53,-24.2914c-0.096,-0.2606 -0.275,-0.4527 -0.522,-0.6172c-0.247,-0.1509 -0.508,-0.2332 -0.782,-0.2332c-0.618,0 -1.03,0.2743 -1.263,0.8367l-11.174,25.0732c-0.055,0.096 -0.082,0.2468 -0.082,0.4252c0,0.3017 0.109,0.5486 0.329,0.7406c0.22,0.1921 0.481,0.2881 0.783,0.2881c0.48,0 0.837,-0.2469 1.07,-0.727l2.952,-6.6523l14.839,0l2.91,6.6523c0.096,0.2332 0.247,0.4115 0.439,0.535c0.192,0.1234 0.385,0.192 0.591,0.192c0.302,0 0.576,-0.096 0.809,-0.2881c0.234,-0.192 0.344,-0.4252 0.344,-0.6995c0,-0.1509 -0.042,-0.3017 -0.11,-0.4526l-11.133,-25.0732zm-7.811,17.0766l6.534,-14.786l6.507,14.786l-13.041,0zm48.389,-17.8859c-0.33,0 -0.604,0.1098 -0.796,0.3429c-0.206,0.2332 -0.302,0.5212 -0.302,0.8779l0,21.9047l-16.72,-22.5494c-0.261,-0.384 -0.59,-0.5761 -0.989,-0.5761c-0.384,0 -0.686,0.1098 -0.906,0.3429c-0.219,0.2332 -0.329,0.5212 -0.329,0.8779l0,24.8811c0,0.3841 0.082,0.6858 0.261,0.9053c0.178,0.2195 0.453,0.3292 0.837,0.3292c0.33,0 0.604,-0.1097 0.81,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-21.946l16.747,22.5906c0.302,0.3841 0.645,0.5761 1.03,0.5761c0.357,0 0.631,-0.1097 0.837,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-24.8812c0,-0.3841 -0.096,-0.6858 -0.288,-0.8916c-0.165,-0.2331 -0.439,-0.3429 -0.796,-0.3429z"/>
+                  <path fill="#4A90E2" d="m37.701,15.6633c0,2.5238 -2.0453,4.5538 -4.5574,4.5538c-2.5121,0 -4.5575,-2.0438 -4.5575,-4.5538c0,-3.4153 -1.1393,-4.5538 -4.5574,-4.5538c-3.4181,0 -4.5575,1.1385 -4.5575,4.5538c0,2.5238 -2.0453,4.5538 -4.5574,4.5538c-2.5121,0 -4.5575,-2.0438 -4.5575,-4.5538c0,-2.5238 2.0454,-4.5538 4.5575,-4.5538c3.4181,0 4.5574,-1.1384 4.5574,-4.5538c0,-2.5237 2.0454,-4.5537 4.5575,-4.5537c2.5121,0 4.5574,2.0437 4.5574,4.5537c0,3.4154 1.1394,4.5538 4.5575,4.5538c2.5258,0 4.5574,2.0437 4.5574,4.5538z"/>
+                  <path fill="#4A90E2" d="m5.7714,29.338c2.517,0 4.5575,-2.0388 4.5575,-4.5538c0,-2.5149 -2.0405,-4.5537 -4.5575,-4.5537c-2.517,0 -4.5574,2.0388 -4.5574,4.5537c0,2.515 2.0404,4.5538 4.5574,4.5538z"/>
+                  <path fill="#4A90E2" d="m65.087,6.5557c0,2.5238 -2.0454,4.5538 -4.5575,4.5538c-3.4181,0 -4.5574,1.1385 -4.5574,4.5538c0,2.5238 -2.0454,4.5538 -4.5575,4.5538c-3.4181,0 -4.5574,1.1384 -4.5574,4.5537c0,2.5238 -2.0454,4.5538 -4.5575,4.5538c-2.5121,0 -4.5574,-2.0437 -4.5574,-4.5538c0,-2.5237 2.0453,-4.5537 4.5574,-4.5537c3.4181,0 4.5575,-1.1385 4.5575,-4.5538c0,-2.5238 2.0453,-4.5538 4.5574,-4.5538c3.4181,0 4.5575,-1.1384 4.5575,-4.5538c0,-2.5237 2.0453,-4.5537 4.5574,-4.5537c2.5121,0 4.5575,2.03 4.5575,4.5537z"/>
+                </g>
+              </svg>
+              </a></li>
               <li class=""><a href="#tab_starpass" data-toggle="tab" aria-expanded="true">StarPass</a></li>
               <li class=""><a href="#tab_paypal" data-toggle="tab" aria-expanded="false">PayPal</a></li>
               <li class=""><a href="#tab_psc" data-toggle="tab" aria-expanded="false">PaySafeCard</a></li>
diff --git a/View/Shop/index.ctp b/View/Shop/index.ctp
index c8d642e..bb25949 100755
--- a/View/Shop/index.ctp
+++ b/View/Shop/index.ctp
@@ -2,7 +2,7 @@
 <?= $this->Html->css('Shop.jquery.bootstrap-touchspin.css') ?>
 <div class="container plugin-shop">
   <div class="row">
-    <div class="col-xs-12 col-md-3">
+    <div class="col-md-3">
       <p class="lead"><?= ($isConnected) ? $money: $Lang->get('SHOP__TITLE'); ?></p>
         <div class="list-group">
             <?php
diff --git a/config.json b/config.json
index 5742dc3..7b8b7a4 100755
--- a/config.json
+++ b/config.json
@@ -37,7 +37,7 @@
 		"Boutique": "/shop"
 	},
 	"author":"Eywek",
-	"version":"1.2.16",
+	"version":"1.2.17",
 	"useEvents":true,
 	"permissions" : {
 		"available" : ["CREDIT_ACCOUNT", "CAN_BUY", "SHOP__ADMIN_MANAGE_ITEMS", "SHOP__ADMIN_MANAGE_CATEGORIES", "SHOP__ADMIN_MANAGE_VOUCHERS", "SHOP__ADMIN_MANAGE_PAYMENT", "SHOP__ADMIN_GIFTALL"],

From 284d9498a3a9f46c6dbd295876f4f2907b631254 Mon Sep 17 00:00:00 2001
From: stashenko <34498917+stashenko@users.noreply.github.com>
Date: Sat, 23 Nov 2019 19:28:23 +0500
Subject: [PATCH 28/45] Create ru_RU.json (#47)

* Create ru_RU.json

* Update ru_RU.json
---
 lang/ru_RU.json | 270 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 270 insertions(+)
 create mode 100644 lang/ru_RU.json

diff --git a/lang/ru_RU.json b/lang/ru_RU.json
new file mode 100644
index 0000000..2d84f11
--- /dev/null
+++ b/lang/ru_RU.json
@@ -0,0 +1,270 @@
+{
+   "SHOP__TITLE": "Магазин",
+       "SHOP__GLOBAL_AMOUNT": "Сумма",
+
+       "SHOP__CONFIG": "Конфигурация",
+       "SHOP__SAVE_SUCCESS": "Сохранено!",
+       "SHOP__SAVE_IN_PROGRESS": "Автоматическое резервное копирование ...",
+       "SHOP__CONFIG_GOAL_TITLE": "Цель месяца",
+       "SHOP__CONFIG_GOAL_DESC": "Оставьте пустым, чтобы удалить",
+       "SHOP__CONFIG_SORT_BY_SERVER": "Сортировать статьи и категории по серверу",
+       "SHOP__CONFIG_BROADCAST_GLOBAL": "Глобальный заказ, сделанный с каждой покупкой",
+       "SHOP__CONFIG_EXPLAIN_TITLE": "Обоснование",
+       "SHOP__CONFIG_EXPLAIN": "Глобальный заказ будет сделан на выбранных серверах приобретенной статьи, вы можете отключить это глобальное сообщение для статьи при ее создании или изменении.",
+       "SHOP__CONFIG_VARIABLES": "Доступные переменные",
+       "SHOP__CONFIG_VARIABLE_ITEM": "Название купленного предмета",
+       "SHOP__CONFIG_VARIABLE_QUANTITY": "Количество купленного товара",
+       "SHOP__CONFIG_VARIABLE_PLAYER": "Игрок, который купил предмет",
+       "SHOP__CONFIG_VARIABLE_SERVERNAME": "Имя сервера, на котором предмет был куплен",
+       "SHOP__CONFIG_SAVE_SUCCESS": "Конфигурация сохранена!",
+
+       "SHOP__ADMIN_MANAGE_ITEMS": "Управление статьями",
+       "SHOP__ADMIN_MANAGE_VOUCHERS": "Управление рекламными акциями",
+       "SHOP__ADMIN_MANAGE_PAYMENT": "Управление платежами",
+
+       "SHOP__PAYPAL_RETURN_MSG": "Вернитесь к {WEBSITE_NAME}, чтобы набирать очки",
+
+       "SHOP__VOUCHERS_MANAGE": "Управление промо-кодами",
+       "SHOP__VOUCHERS_HISTORIES": "История использования промокодов",
+       "SHOP__VOUCHER_END_DATE": "Дата окончания",
+       "SHOP__VOUCHER_START_DATE": "Дата начала",
+       "SHOP__VOUCHER_START_DATE_EXPLAIN": "Если вы установите время начала другой , чем сейчас, ваше продвижение может быть предварительно отображаться в хранилище , если«отображается опция, цель пользователи не будут BLE использовать его",
+       "SHOP__VOUCHER_VALUE_LABEL": "Сокращение",
+       "SHOP__VOUCHER_VALUE_INPUT": "В {MONEY_NAME} или проколоть",
+       "SHOP__VOUCHER_DISPLAYED": "Опубликовано",
+       "SHOP__VOUCHER_CHOOSE_TYPE": "Выберите тип",
+       "SHOP__VOUCHER_MSG_ONE_CATEGORY": "Для того, чтобы содействовать в прогрессе в категории {CATEGORY} с кодом: . {CODE} ({REDUCTION})",
+       "SHOP__VOUCHER_MSG_MANY_CATEGORIES": "В категориях {CATEGORIES} проводится промоакция с кодом:  {CODE} (Reduced {REDUCTION}).",
+       "SHOP__VOUCHER_MSG_ONE_ITEM": "Для того, чтобы содействовать в ходе работы по вопросу {ITEM} с кодом: . {CODE} ({REDUCTION})",
+       "SHOP__VOUCHER_MSG_MANY_ITEMS": "Промоушен выполняется на {ITEMS} элементах с кодом:  {CODE} (Reduced {REDUCTION}).",
+       "SHOP__VOUCHER_MSG_ALL": "В магазине выполняется акция с кодом:  {CODE} (сокращение {REDUCTION}).",
+       "SHOP__VOUCHER_MSG_SOON": "! {REDUCTION} продвижения будет доступен на {START_DATE}",
+       "SHOP__VOUCHER_ADD": "Добавить промо-код",
+       "SHOP__VOUCHER_SELECT": "Действует на",
+       "SHOP__VOUCHER_SELECT_CHOOSE": "Выберите вариант",
+       "SHOP__VOUCHER_GENERATE": "Создать код",
+       "SHOP__VOUCHER_SELECT_ITEMS": "Выберите статью(и)",
+       "SHOP__VOUCHER_SELECT_CATEGORIES": "Выберите категорию(и)",
+       "SHOP__VOUCHER_TYPE_PERCENTAGE": "Процент",
+       "SHOP__VOUCHER_DISPLAY_CHECKBOX": "Если этот флажок установлен, промоушен будет отображаться в магазине",
+       "SHOP__VOUCHER_ADD_SUCCESS": "Акция была добавлена!",
+       "SHOP__VOUCHER_ADD_ERROR_CODE_INVALID": "Ваш код недействителен! (Может быть только буквенно-цифровым, # допускается, максимум 20 символов)",
+       "SHOP__VOUCHER_DELETE_SUCCESS": "Акция была удалена!",
+       "SHOP__VOUCHER_LIMIT": "Лимит использования",
+       "SHOP__VOUCHER_LIMIT_SHORT": "Лимит",
+       "SHOP__VOUCHER_LIMIT_DESC": "Поставь 0 для безлимитов",
+       "SHOP__VOUCHER_LIMIT_TYPE": "Тип ограничения",
+       "SHOP__VOUCHER_LIMIT_TYPE_USER": "На пользователя",
+       "SHOP__VOUCHER_LIMIT_TYPE_GLOBAL": "Глобальный",
+       "SHOP__VOUCHER_CODE": "Код",
+       "SHOP__VOUCHER_REDUCTION": "скидка {MONEY_NAME}",
+
+       "SHOP__PAYSAFECARD": "PaySafeCard",
+       "SHOP__PAYSAFECARD_CODE": "Код",
+       "SHOP__PAYSAFECARD_VALID_USER": "Кто подтвержден?",
+       "SHOP__PAYSAFECARD_HISTORIES": "История транзакций PaySafeCard",
+       "SHOP__PAYSAFECARD_ADMIN_TITLE": "Список ожидающих PaySafeCards",
+       "SHOP__PAYSAFECARD_DISABLE_SUCCESS": "PaySafeCard была деактивирована!",
+       "SHOP__PAYSAFECARD_ENABLE_SUCCESS": "PaySafeCard была деактивирована!",
+       "SHOP__PAYSAFECARD_ERROR_ALREADY_TOO_PSC_IN_DB": "У вас уже есть 2 ожидающих PaySafeCard",
+       "SHOP__PAYSAFECARD_ERROR_ALREADY_IN_DB": "У вас уже есть эта ожидание PaySafeCard",
+       "SHOP__PAYSAFECARD_VALID_SUCCESS": "PaySafeCard была проверена!",
+       "SHOP__PAYSAFECARD_INVALID_SUCCESS": "В PaySafeCard отказано!",
+       "SHOP__PAYSAFECARD_ADD_SUCCESS": "PaySafeCard добавлен! Вы получите ответ в течение 48 часов",
+       "SHOP__PAYSAFECARD_VALID_CONFIRM": "Сколько Очков Магазина вы хотите дать за эту PaySafeCard?",
+       "SHOP__PAYSAFECARD_MESSAGE_VALID": "Ваша {AMOUNT} PaySafeCard была подтверждена! Вы зарабатываете {POINTS} {MONEY_NAME}.",
+       "SHOP__PAYSAFECARD_MESSAGE_INVALID": "Ваша {AMOUNT} PaySafeCard была отклонена.",
+       "SHOP__PAYSAFECARD_ACCEPT": "Подтвердить",
+       "SHOP__PAYSAFECARD_REFUSE": "Запретить",
+
+       "SHOP__DEDIPASS_PAYMENT": "Оплатить с помощью dedipass",
+       "SHOP__DEDIPASS_CONFIGURATION": "Конфигурация Dedipass",
+       "SHOP__DEDIPASS_EDIT_CONFIG_SUCCESS": "Конфигурация была успешно отредактирована!",
+       "SHOP__DEDIPASS_TOGGLE_ERROR_NO_CONFIG": "Вы не можете активировать Dedipass, если вы ранее не устанавливали открытый ключ!",
+       "SHOP__DEDIPASS_TOGGLE_ENABLE_SUCCESS": "Вы успешно активировали Dedipass в качестве способа оплаты!",
+       "SHOP__DEDIPASS_TOGGLE_DISABLE_SUCCESS": "Вы отключили Dedipass в качестве способа оплаты!",
+       "SHOP__DEDIPASS_PUBLICKEY": "Открытый ключ (называемый <i> data-dedipass </ i> в части установки Dédipass)",
+       "SHOP__DEDIPASS_HISTORIES": "История транзакций Dedipass",
+       "SHOP__DEDIPASS_PAYMENT_ERROR_NOT_CONNECTED": "Вы не вошли в систему, пожалуйста, войдите в систему и повторите попытку (ранее введенный код: {CODE}).",
+       "SHOP__DEDIPASS_PAYMENT_ERROR_INVAID_CODE": "Введенный код недействителен",
+       "SHOP__DEDIPASS_PAYMENT_ERROR_EMPTY_CODE": "Пожалуйста, введите код.",
+       "SHOP__DEDIPASS_PAYMENT_ERROR_EMPTY_RATE": "Пожалуйста, выберите предложение",
+       "SHOP__DEDIPASS_PAYMENT_SUCCESS": "Транзакция Dedipass прошла успешно, вам зачислено {MONEY} {MONEY_NAME}.",
+       "SHOP__DEDIPASS_CODE": "Код",
+       "SHOP__DEDIPASS_RATE": "Посадка",
+       "SHOP__DEDIPASS_EXPLAIN_CONFIG": "Чтобы использовать Dedipass, вам необходимо зарегистрироваться на веб-сайте <b> Dedipass </ b>, а затем добавить новый сервис. Вы должны выбрать <i> виртуальную валюту </ i> и затем настроить необходимые вам. следующие URL: ",
+       "SHOP__DEDIPASS_EXPLAIN_CONFIG_URL_1": "Установка URL",
+       "SHOP__DEDIPASS_EXPLAIN_CONFIG_URL_2": "URL перенаправления",
+
+       "SHOP__USER_POINTS_TRANSFER": "Отправить деньги",
+       "SHOP__USER_POINTS_TRANSFER_ADMIN": "Передача очков",
+       "SHOP__USER_POINTS_TRANSFER_HISTORIES": "{MONEY_NAME} перенести историю между игроками",
+       "SHOP__USER_POINTS_TRANSFER_WHO": "Кто?",
+       "SHOP__USER_POINTS_TRANSFER_HOW_MANY": "Сколько?",
+       "SHOP__USER_POINTS_TRANSFER_ERROR_EMPTY": "Вы ничего не можете отправить",
+       "SHOP__USER_POINTS_TRANSFER_ERROR_YOURSELF": "Вы не можете переводить кредиты себе",
+       "SHOP__USER_POINTS_TRANSFER_ERROR_DISABLED": "Передача баллов отключена.",
+       "SHOP__USER_POINTS_TRANSFER_ERROR_WAIT": "Вам нужно немного подождать, прежде чем вы сможете перевести.",
+       "SHOP__USER_POINTS_TRANSFER_SUCCESS": "Деньги отправлены!",
+       "SHOP__TRANSFER_ENABLE_SUCCESS": "Вы активировали перевод очков!",
+       "SHOP__TRANSFER_DISABLE_SUCCESS": "Вы отключили передачу баллов!",
+	
+       "SHOP__GIFTALL": "Сделай подарок каждому",
+         "SHOP__GIFTALL_VALUE": "Количество точек магазина, которые должны быть предоставлены всем пользователям сайта",
+         "SHOP__GIFTALL_SUCCESS": "Ваш подарок сделан",
+
+       "SHOP__ITEM": "Статья",
+       "SHOP__ITEMS": "Статьи",
+       "SHOP__ITEM_ADD_COMMAND": "Добавить заказ",
+       "SHOP__ITEM_EDIT": "Редактирование статьи",
+       "SHOP__ITEMS_AVAILABLE": "Товары для продажи",
+       "SHOP__ITEM_NAME": "Имя",
+       "SHOP__ITEM_IMG_URL": "URL изображения",
+       "SHOP__ITEM_PRICE": "Цена",
+       "SHOP__ITEM_QUANTITY": "Количество",
+       "SHOP__ITEM_TOTAL": "Всего",
+       "SHOP__ITEM_DESCRIPTION": "Описание",
+       "SHOP__ITEM_EDIT_SUCCESS": "Статья успешно изменена!",
+       "SHOP__ITEM_DELETE_SUCCESS": "Статья успешно удалена!",
+       "SHOP__ITEM_ADD_SUCCESS": "Статья успешно добавлена!",
+       "SHOP__ITEM_ADD": "Добавить статью",
+       "SHOP__ITEM_TIMED_COMMAND": "РАЗЛИЧНЫЕ КОМАНДЫ",
+       "SHOP__ITEM_TIMED_COMMAND_DESC": "Это команда, которая будет выполнена через определенное время (например, для оценок)",
+       "SHOP__ITEM_TIMED_COMMAND_TIME": "Время",
+       "SHOP__ITEM_DISPLAY_SERVER": "Показать сервер (ы), где будет предоставлена ​​статья.",
+       "SHOP__ITEM_CHECKBOX_CONNECT": "Требовать, чтобы игрок был подключен к серверу, чтобы купить статью",
+       "SHOP__ITEM_CHECKBOX_DISPLAY": "Показать статью в магазине",
+       "SHOP__ITEM_MULTIPLE_BUY": "Разрешить покупку этого предмета несколько раз (только за одну покупку)",
+       "SHOP__ITEM_CANT_BUY_MULTIPLE": "Вы не можете купить этот товар (<i> {ITEM_NAME} </ i>) более одного раза",
+       "SHOP__ITEM_CART": "Разрешить добавить в корзину этой статьи",
+       "SHOP__ITEM_CANT_ADDED_TO_CART": "Вы не можете купить товар <i> {ITEM_NAME} </ i> с помощью корзины.",
+       "SHOP__ITEM_CANT_BUY_LIMIT": "Вы не можете купить товар <i> {ITEM_NAME} </ i> более {LIMIT} раз.",
+       "SHOP__ITEM_BROADCAST_GLOBAL": "Сделать глобальный заказ при покупке этого товара",
+       "SHOP__ITEM_PREREQUISITES": "Вы хотите активировать предварительные условия?",
+       "SHOP__ITEM_PREREQUISITES_TYPE_0": "Нет",
+       "SHOP__ITEM_PREREQUISITES_TYPE_1": "Да, игрок должен был купить все следующие предметы",
+       "SHOP__ITEM_PREREQUISITES_TYPE_2": "Да, игрок должен был купить хотя бы один из следующих предметов",
+       "SHOP__ITEM_PREREQUISITES_ITEMS": "Доступные позиции",
+       "SHOP__ITEM_CHECKBOX_REDUCTIONAL_ITEMS": "Активировать снижение цены или один из следующих предметов куплен / куплен",
+       "SHOP__ITEM_REDUCTIONAL_ITEMS_LIST": "Скидка применяется к этому товару ({REDUCTION}), потому что вы уже приобрели следующие товары {ITEMS_LIST}.",
+       "SHOP__ITEM_CANT_BUY_PREREQUISITES_1": "Вы не можете купить этот предмет у следующих предметов:  {ITEMS}",
+       "SHOP__ITEM_CANT_BUY_PREREQUISITES_2": "Вы не можете купить этот предмет у следующих предметов:  {ITEMS}",
+       "SHOP__ITEM_GIVE_SKIN": "Дать разрешение на изменение скина при покупке этой статьи",
+       "SHOP__ITEM_GIVE_CAPE": "Дать разрешение сменить накидку при покупке этой статьи",
+       "SHOP__ITEM_CANT_BUY_NOT_CONNECTED": "Вы должны войти в систему, чтобы купить предмет <b> {ITEM_NAME} </ b>!",
+       "SHOP__ITEM_BUY_LIMIT": "Лимит покупки (сколько можно купить максимум)",
+       "SHOP__ITEM_BUY_LIMIT_PLACEHOLDER": "Поставьте 0 для безлимитных",
+       "SHOP__ITEM_WAIT_TIME": "Интервал времени между покупками",
+       "SHOP__ITEM_CANT_BUY_WAIT_TIME": "Вы не можете купить предмет <i> {ITEM_NAME} </ i> сейчас! Каждая покупка должна быть отделена от {WAIT_TIME}.",
+       "SHOP__ITEMS_AVAILABLE_OTHER": "Элементы не указаны",
+       "SHOP__ITEM_CURRENCY": "Валюта (EUR, USD ...)",
+       "SHOP__CATEGORIES": "Категории",
+       "SHOP__CATEGORY": "Категория",
+       "SHOP__CATEGORY_ADD": "Добавить категорию",
+       "SHOP__CATEGORY_ADD_SUCCESS": "Категория успешно добавлена!",
+       "SHOP__CATEGORY_EDIT_SUCCESS": "Категория успешно изменена!",
+       "SHOP__CATEGORY_DELETE_SUCCESS": "Категория успешно удалена!",
+       "SHOP__CATEGORY_NUMBER": "Количество статей, связанных с категорией",
+
+       "SHOP__BUY": "Купить",
+       "SHOP__BUY_CART": "Посмотреть мою корзину",
+       "SHOP__BUY_CART_EMPTY": "Ваша корзина пуста.",
+       "SHOP__BUY_ADD_TO_CART": "Добавить в корзину",
+       "SHOP__BUY_ADDED_TO_CART": "Добавлено в корзину",
+       "SHOP__BUY_ERROR_NO_ENOUGH_MONEY": "У вас недостаточно денег для совершения этой покупки.",
+       "SHOP__BUY_ERROR_NEED_LOGIN": "Вы должны войти в систему, чтобы сделать покупку.",
+       "SHOP__BUY_ERROR_EMPTY": "Вы ничего не можете купить.",
+       "SHOP__BUY_ERROR_NO_CONNECTED": "Вы должны войти в систему, чтобы сделать эту покупку.",
+       "SHOP__BUY_CONFIRM": "Вы действительно хотите купить этот предмет?",
+       "SHOP__BUY_SUCCESS": "Покупка только что была сделана",
+       "SHOP__BUY_VOUCHER_ASK": "У вас есть промо-код?",
+
+       "SHOP__ADD_MONEY": "Кредитный счет",
+       "SHOP__MONEY_CURRENTLY": "У вас сейчас есть",
+
+       "SHOP__PAYPAL_OFFERS": "Предложения PayPal",
+       "SHOP__PAYPAL_OFFER": "Предложение",
+       "SHOP__PAYPAL_HISTORIES": "История транзакций PayPal",
+       "SHOP__PAYPAL_MAIL": "Электронная почта",
+       "SHOP__PAYPAL_OFFER_ADD": "Добавить в предложение PayPal",
+       "SHOP__PAYPAL_OFFER_ADD_SUCCESS": "Предложение PayPal успешно добавлено!",
+       "SHOP__PAYPAL_OFFER_EDIT": "Изменить предложение PayPal",
+       "SHOP__PAYPAL_OFFER_EDIT_SUCCESS": "Предложение PayPal успешно изменено!",
+       "SHOP__PAYPAL_OFFER_DELETE_SUCCESS": "Предложение PayPal было удалено!",
+       "SHOP__PAYPAL_PAYMENT_ID": "идентификатор PayPal",
+       "SHOP__PAYPAL_PAYMENT_DELAY": "Пользователи могут быть зачислены на счет в течение 5 минут после оплаты через PayPal. Эта задержка зависит от услуг PayPal.",
+
+       "SHOP__NANO_OFFERS": "Нано предложения",
+       "SHOP__NANO_OFFER": "Предложение",
+       "SHOP__NANO_HISTORIES": "История нанотранзакций",
+       "SHOP__NANO_ADDRESS": "адрес (nano _...)",
+       "SHOP__NANO_OFFER_ADD": "Добавить предложение Nano",
+       "SHOP__NANO_OFFER_ADD_SUCCESS": "Нано предложение успешно добавлено!",
+       "SHOP__NANO_OFFER_EDIT": "Изменить предложение Nano",
+       "SHOP__NANO_OFFER_EDIT_SUCCESS": "Нано предложение успешно изменено!",
+       "SHOP__NANO_OFFER_DELETE_SUCCESS": "Нано предложение удалено !",
+       "SHOP__ERROR_NANO_ADDRESS_NOT_VALID": "Нано-адрес недействителен!",
+       "SHOP__NANO_EXPLAIN_CONFIG_1": "Для начала вам нужен кошелек или на: ",
+       "SHOP__NANO_EXPLAIN_CONFIG_2": "или с помощью мобильного приложения",
+       "SHOP__NANO_EXPLAIN_CONFIG_3": "Краткое введение Nano доступно",
+       "SHOP__NANO_EXPLAIN_CONFIG_4": "Вы можете получить больше информации",
+       "SHOP__OFFER_MONEY_TO_ADD": "Сколько {MONEY_NAME} вы хотите дать?",
+
+       "SHOP__STARPASS_OFFERS": "Предложения StarPass",
+       "SHOP__STARPASS_CODE": "Код",
+       "SHOP__STARPASS_OFFER": "Предложение",
+       "SHOP__STARPASS_HISTORIES": "История транзакций StarPass",
+       "SHOP__STARPASS_OFFER_DELETE_SUCCESS": "Предложение StarPass удалено!",
+       "SHOP__STARPASS_OFFER_ADD": "Добавить предложение StarPass",
+       "SHOP__STARPASS_OFFER_ADD_SUCCESS": "Предложение StarPass успешно добавлено!",
+       "SHOP__STARPASS_OFFER_EDIT": "Изменить предложение StarPass",
+       "SHOP__STARPASS_OFFER_EDIT_SUCCESS": "Предложение StarPass успешно изменено!",
+       "SHOP__STARPASS_PAYMENT": "Создать учетную запись с StarPass",
+       "SHOP__STARPASS_PAYMENT_SUCCESS": "Транзакция StarPass прошла успешно! Вы получили свой кредитный магазин.",
+       "SHOP__STARPASS_PAYMENT_ERROR": "Введенный код не так, пожалуйста , попробуйте еще раз.",
+
+       "SHOP__DASHBOARD_GRAPH_ERROR": "У вас должно быть более 5 различных элементов для доступа к диаграмме",
+       "SHOP__ADMIN_PART_2": "Администрирование кредитов",
+       "SHOP__ADMIN_PART_1": "Вернитесь в магазин",
+       "SHOP__HISTORY_TRANSFER_MONEY": "История обмена",
+       "SHOP__HISTORY_PURCHASES": "История покупок",
+       "SHOP__HISTORY_PURCHASES_MONEY": "{MONEY_NAME} История покупки",
+
+       "PERMISSIONS__CREDIT_ACCOUNT": "Создать аккаунт",
+       "PERMISSIONS__CAN_BUY": "Buy",
+       "PERMISSIONS__SHOP__ADMIN_MANAGE_ITEMS": "Управление товарами магазина (добавление, редактирование, удаление)",
+       "PERMISSIONS__SHOP__ADMIN_MANAGE_VOUCHERS": "Управление промо-кодами магазина (добавить, удалить)",
+       "PERMISSIONS__SHOP__ADMIN_MANAGE_PAYMENT": "Управление платежами магазина (добавление, редактирование, удаление, проверка PSC ...)",
+       "PERMISSIONS__VOTE__ADMIN_VIEW_TOP": "Перейти на верхнюю страницу голосования",
+       "PERMISSIONS__SHOP__ADMIN_GIFTALL": "Управление подарками (пожертвование баллов)",
+       "PERMISSIONS__SHOP__ADMIN_MANAGE_CATEGORIES": "Управление категориями магазина (Добавить, Изменить, Удалить)",
+
+       "NOTIFICATION__NEW_VOUCHER": "Доступен новый промокод!",
+       "NOTIFICATION__NEW_PSC": "Новая PaySafeCard должна быть проверена!",
+       "NOTIFICATION__PAYPAL_IPN_VALIDED": "Ваш платеж PayPal подтвержден!",
+       "NOTIFICATION__NANO_VALIDED": "Ваш нано платеж подтвержден!",
+
+       "HISTORY__CATEGORY_SHOP": "Магазин",
+       "HISTORY__CATEGORY_CREDIT_SHOP": "Кредитование магазина",
+       "HISTORY__ACTION_VALID_PAYSAFECARD": "Проверка PaySafeCard",
+       "HISTORY__ACTION_DELETE_VOUCHER": "Подавление промокода",
+       "HISTORY__ACTION_ADD_VOUCHER": "Добавление промо-кода",
+       "HISTORY__ACTION_BUY_MONEY_DEDIPASS": "Покупка кредитов Dedipass",
+       "HISTORY__ACTION_EDIT_DEDIPASS_CONFIG": "Изменение конфигурации Dedipass",
+       "HISTORY__ACTION_DELETE_ITEM": "Удаление товара из магазина",
+       "HISTORY__ACTION_ADD_ITEM": "Добавить статью о магазине",
+       "HISTORY__ACTION_ADD_CATEGORY": "Добавить категорию в магазин",
+       "HISTORY__ACTION_BUY_ITEM": "Покупка",
+       "HISTORY__ACTION_BUY_MONEY": "Покупка торговых точек",
+       "HISTORY__ACTION_SEND_MONEY": "Отправить деньги",
+       "HISTORY__ACTION_ADD_PAYPAL_OFFER": "Добавление предложения PayPal",
+       "HISTORY__ACTION_ADD_NANO_OFFER": "Добавление нано-предложения",
+       "HISTORY__ACTION_ADD_STARPASS_OFFER": "Добавление предложения StarPass",
+       "HISTORY__ACTION_DELETE_PAYPAL_OFFER": "Удаление предложения PayPal",
+       "HISTORY__ACTION_DELETE_STARPASS_OFFER": "Удаление предложения StarPass",
+       "HISTORY__ACTION_EDIT_PAYPAL_OFFER": "Изменение предложения PayPal",
+       "HISTORY__ACTION_EDIT_STARPASS_OFFER": "Изменение предложения StarPass",
+       "HISTORY__ACTION_ENABLE_PAYSAFECARD": "Активация способа оплаты PaySafeCard",
+       "HISTORY__ACTION_DISABLE_PAYSAFECARD": "Отключение метода оплаты PaySafeCard",
+       "HISTORY__ACTION_ADD_PAYSAFECARD": "Добавление PaySafeCard"
+}

From 9b5eebd8fa6280f5deef89111d2a93373cceec2f Mon Sep 17 00:00:00 2001
From: Valentin T <Eywek@users.noreply.github.com>
Date: Sat, 23 Nov 2019 15:29:00 +0100
Subject: [PATCH 29/45] Update config.json

---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.json b/config.json
index 7b8b7a4..3681f8f 100755
--- a/config.json
+++ b/config.json
@@ -37,7 +37,7 @@
 		"Boutique": "/shop"
 	},
 	"author":"Eywek",
-	"version":"1.2.17",
+	"version":"1.2.18",
 	"useEvents":true,
 	"permissions" : {
 		"available" : ["CREDIT_ACCOUNT", "CAN_BUY", "SHOP__ADMIN_MANAGE_ITEMS", "SHOP__ADMIN_MANAGE_CATEGORIES", "SHOP__ADMIN_MANAGE_VOUCHERS", "SHOP__ADMIN_MANAGE_PAYMENT", "SHOP__ADMIN_GIFTALL"],

From 1a966d59d30c61d968d53365e93944ad4d27712f Mon Sep 17 00:00:00 2001
From: nivcoo <36514752+nivcoo@users.noreply.github.com>
Date: Mon, 30 Dec 2019 12:16:58 +0100
Subject: [PATCH 30/45] improv. error 500 without id (#44)

* improv. error 500 without id

* improv. change condition

* improv. change condition
---
 Controller/ShopController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Controller/ShopController.php b/Controller/ShopController.php
index f614dac..0e1bb30 100755
--- a/Controller/ShopController.php
+++ b/Controller/ShopController.php
@@ -137,10 +137,13 @@ function index($category = false)
     * ======== Affichage d'un article dans le modal ===========
     */
 
-    function ajax_get($id)
+    function ajax_get($id = null)
     { // Permet d'afficher le contenu du modal avant l'achat (ajax)
         $this->response->type('json');
         $this->autoRender = false;
+        if (!isset($id)) {
+            throw new NotFoundException();
+        }
         if ($this->isConnected AND $this->Permissions->can('CAN_BUY')) { // si l'utilisateur est connecté
             $this->loadModel('Shop.Item'); // je charge le model des articles
             $search_item = $this->Item->find('all', array('conditions' => array('id' => $id))); // je cherche l'article selon l'id
@@ -286,6 +289,7 @@ function ajax_get($id)
         } else {
             $this->response->body(json_encode(array('statut' => false, 'html' => '<div class="alert alert-danger">' . $this->Lang->get('USER__ERROR_MUST_BE_LOGGED') . '</div>'))); // si il n'est pas connecté
         }
+
     }
 
 

From 071159d90d08521a7fcc942a01294fa8b1da5862 Mon Sep 17 00:00:00 2001
From: nivcoo <36514752+nivcoo@users.noreply.github.com>
Date: Mon, 30 Dec 2019 12:17:29 +0100
Subject: [PATCH 31/45] improv. error 200 failed ipn (#48)

---
 Controller/PaymentController.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Controller/PaymentController.php b/Controller/PaymentController.php
index a81e772..4c96b75 100755
--- a/Controller/PaymentController.php
+++ b/Controller/PaymentController.php
@@ -1075,7 +1075,7 @@ public function ipn()
             // On assigne les variables
             $item_name = $this->request->data['item_name'];
             $item_number = $this->request->data['item_number'];
-            $payment_status = $this->request->data['payment_status'];
+            $payment_status = strtoupper($this->request->data['payment_status']);
             $payment_amount = $this->request->data['mc_gross'];
             $payment_currency = $this->request->data['mc_currency'];
             $txn_id = $this->request->data['txn_id'];
@@ -1139,7 +1139,7 @@ public function ipn()
 
             // On effectue les autres vérifications
 
-            if ($payment_status == "Completed") { //Le paiment est complété
+            if ($payment_status == "COMPLETED") { //Le paiment est complété
 
                 if ($payment_currency == "EUR") { //Le paiement est bien en euros
 
@@ -1188,11 +1188,9 @@ public function ipn()
                                 $this->loadModel('Notification');
                                 $this->Notification->setToUser($this->Lang->get('NOTIFICATION__PAYPAL_IPN_VALIDED'), $user_id);
 
-                                $this->response->statusCode(200);
-
-                            } else {
+                            } else
                                 throw new InternalErrorException('PayPal : Payment already credited');
-                            }
+                            return $this->response->statusCode(200);
 
                         } else {
                             throw new InternalErrorException('PayPal : Receiver email invalid');

From 6c1a7a645a739440526208bb20f53fdeb81494cb Mon Sep 17 00:00:00 2001
From: Valentin T <Eywek@users.noreply.github.com>
Date: Mon, 30 Dec 2019 12:17:52 +0100
Subject: [PATCH 32/45] Update config.json

---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.json b/config.json
index 3681f8f..6b862f5 100755
--- a/config.json
+++ b/config.json
@@ -37,7 +37,7 @@
 		"Boutique": "/shop"
 	},
 	"author":"Eywek",
-	"version":"1.2.18",
+	"version":"1.2.19",
 	"useEvents":true,
 	"permissions" : {
 		"available" : ["CREDIT_ACCOUNT", "CAN_BUY", "SHOP__ADMIN_MANAGE_ITEMS", "SHOP__ADMIN_MANAGE_CATEGORIES", "SHOP__ADMIN_MANAGE_VOUCHERS", "SHOP__ADMIN_MANAGE_PAYMENT", "SHOP__ADMIN_GIFTALL"],

From 718eb528e36f2f2f3d52c5acab52d33b99a38771 Mon Sep 17 00:00:00 2001
From: nivcoo <36514752+nivcoo@users.noreply.github.com>
Date: Tue, 28 Jan 2020 11:16:37 +0100
Subject: [PATCH 33/45] improv. error when reduction was big (#50)

---
 SQL/schema.php | 484 +++++++++++++++++++++++++------------------------
 1 file changed, 244 insertions(+), 240 deletions(-)

diff --git a/SQL/schema.php b/SQL/schema.php
index ddc2d35..27ce061 100755
--- a/SQL/schema.php
+++ b/SQL/schema.php
@@ -1,265 +1,269 @@
 <?php
-class ShopAppSchema extends CakeSchema {
 
-	public $file = 'schema.php';
+class ShopAppSchema extends CakeSchema
+{
 
-	public function before($event = array()) {
-		return true;
-	}
+    public $file = 'schema.php';
 
-	public function after($event = array()) {
-	}
+    public function before($event = array())
+    {
+        return true;
+    }
 
-	public $shop__categories = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
-		'name' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public function after($event = array())
+    {
+    }
 
-	public $shop__dedipass_configs = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
-		'public_key' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 50, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'status' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 1, 'unsigned' => false),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__categories = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
+        'name' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__dedipass_histories = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
-		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'code' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 8, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'rate' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 30, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'credits_gived' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 10, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__dedipass_configs = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
+        'public_key' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 50, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'status' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 1, 'unsigned' => false),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__items = array(
-		'order' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 20, 'unsigned' => false),
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
-		'name' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'description' => array('type' => 'text', 'null' => false, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'price' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'updated' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'servers' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'commands' => array('type' => 'text', 'null' => false, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'img_url' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'category' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false),
-		'timedCommand' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 1, 'unsigned' => false),
-		'timedCommand_cmd' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'timedCommand_time' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false),
-		'display_server' => array('type' => 'integer', 'null' => true, 'default' => '1', 'length' => 1, 'unsigned' => false),
-		'need_connect' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 1, 'unsigned' => false),
-		'display' => array('type' => 'integer', 'null' => true, 'default' => '1', 'length' => 1, 'unsigned' => false),
-		'multiple_buy' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 1, 'unsigned' => false),
-		'broadcast_global' => array('type' => 'integer', 'null' => true, 'default' => '1', 'length' => 1, 'unsigned' => false),
-		'cart' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 1, 'unsigned' => false),
-		'prerequisites_type' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 1, 'unsigned' => false, 'comment' => '1= tous les articles, 2 = au moins 1 des articles'),
-		'prerequisites' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'reductional_items' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'give_skin' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 1, 'unsigned' => false),
-		'give_cape' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 1, 'unsigned' => false),
-		'buy_limit' => array('type' => 'integer', 'null' => true, 'default' => '0', 'unsigned' => false),
-		'wait_time' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__dedipass_histories = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
+        'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'code' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 8, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'rate' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 30, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'credits_gived' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 10, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__items_buy_histories = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
-		'item_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__items = array(
+        'order' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 20, 'unsigned' => false),
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
+        'name' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'description' => array('type' => 'text', 'null' => false, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'price' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
+        'updated' => array('type' => 'datetime', 'null' => false, 'default' => null),
+        'servers' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'commands' => array('type' => 'text', 'null' => false, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'img_url' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'category' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false),
+        'timedCommand' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 1, 'unsigned' => false),
+        'timedCommand_cmd' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'timedCommand_time' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => false),
+        'display_server' => array('type' => 'integer', 'null' => true, 'default' => '1', 'length' => 1, 'unsigned' => false),
+        'need_connect' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 1, 'unsigned' => false),
+        'display' => array('type' => 'integer', 'null' => true, 'default' => '1', 'length' => 1, 'unsigned' => false),
+        'multiple_buy' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 1, 'unsigned' => false),
+        'broadcast_global' => array('type' => 'integer', 'null' => true, 'default' => '1', 'length' => 1, 'unsigned' => false),
+        'cart' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 1, 'unsigned' => false),
+        'prerequisites_type' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 1, 'unsigned' => false, 'comment' => '1= tous les articles, 2 = au moins 1 des articles'),
+        'prerequisites' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'reductional_items' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'give_skin' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 1, 'unsigned' => false),
+        'give_cape' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 1, 'unsigned' => false),
+        'buy_limit' => array('type' => 'integer', 'null' => true, 'default' => '0', 'unsigned' => false),
+        'wait_time' => array('type' => 'string', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__items_configs = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
-		'goal' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => true),
-		'broadcast_global' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'sort_by_server' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 1, 'unsigned' => false),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__items_buy_histories = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
+        'item_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__paypal_histories = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
-		'payment_id' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'offer_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'payment_amount' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'credits_gived' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 10, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__items_configs = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
+        'goal' => array('type' => 'integer', 'null' => true, 'default' => null, 'unsigned' => true),
+        'broadcast_global' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'sort_by_server' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 1, 'unsigned' => false),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__paypals = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
-		'email' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 50, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'name' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 50, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'price' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'money' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__paypal_histories = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
+        'payment_id' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'offer_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'payment_amount' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'credits_gived' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 10, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__nanos = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
-		'address' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 65, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'name' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 50, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'price' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'currency' => array('type' => 'string', 'eur' => false, 'length' => 3, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'money' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__paypals = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
+        'email' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 50, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'name' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 50, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'price' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'money' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__nano_histories = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
-		'token' => array('type' => 'string', 'null' => false, 'length' => 300, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'offer_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'payment_amount' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'currency' => array('type' => 'string', 'eur' => false, 'length' => 3, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'credits_gived' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 10, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1),
-			'U_token' => array('column' => 'token', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__nanos = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
+        'address' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 65, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'name' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 50, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'price' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'currency' => array('type' => 'string', 'eur' => false, 'length' => 3, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'money' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__paysafecard_histories = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
-		'code' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'amount' => array('type' => 'string', 'null' => false, 'length' => 3, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'credits_gived' => array('type' => 'string', 'null' => false, 'length' => 10, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'author_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__nano_histories = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
+        'token' => array('type' => 'string', 'null' => false, 'length' => 300, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'offer_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'payment_amount' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'currency' => array('type' => 'string', 'eur' => false, 'length' => 3, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'credits_gived' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 10, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1),
+            'U_token' => array('column' => 'token', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__paysafecard_messages = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
-		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'type' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 1, 'unsigned' => false),
-		'amount' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 3, 'unsigned' => false),
-		'added_points' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 5, 'unsigned' => false),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__paysafecard_histories = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
+        'code' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'amount' => array('type' => 'string', 'null' => false, 'length' => 3, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'credits_gived' => array('type' => 'string', 'null' => false, 'length' => 10, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
+        'author_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__paysafecards = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
-		'amount' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 3, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'code' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__paysafecard_messages = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
+        'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'type' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 1, 'unsigned' => false),
+        'amount' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 3, 'unsigned' => false),
+        'added_points' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 5, 'unsigned' => false),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__points_transfer_histories = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
-		'points' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'author_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__paysafecards = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
+        'amount' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 3, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'code' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__starpass_histories = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
-		'code' => array('type' => 'string', 'null' => false, 'length' => 40, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'offer_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'credits_gived' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 10, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__points_transfer_histories = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
+        'points' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'author_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__starpasses = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
-		'name' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 50, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'money' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false),
-		'idd' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 5, 'unsigned' => false),
-		'idp' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 5, 'unsigned' => false),
-		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__starpass_histories = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
+        'code' => array('type' => 'string', 'null' => false, 'length' => 40, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'offer_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'credits_gived' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 10, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__vouchers = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
-		'code' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'type' => array('type' => 'integer', 'null' => false, 'default' => '1', 'length' => 1, 'unsigned' => false),
-		'reduction' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 3, 'unsigned' => false),
-		'effective_on' => array('type' => 'text', 'null' => false, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'limit' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 10, 'unsigned' => false),
+    public $shop__starpasses = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
+        'name' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 50, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'money' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false),
+        'idd' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 5, 'unsigned' => false),
+        'idp' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 5, 'unsigned' => false),
+        'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
+
+    public $shop__vouchers = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
+        'code' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'type' => array('type' => 'integer', 'null' => false, 'default' => '1', 'length' => 1, 'unsigned' => false),
+        'reduction' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 5, 'unsigned' => false),
+        'effective_on' => array('type' => 'text', 'null' => false, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'limit' => array('type' => 'integer', 'null' => true, 'default' => '0', 'length' => 10, 'unsigned' => false),
         'limit_type' => array('type' => 'integer', 'null' => true, 'default' => '1', 'length' => 1, 'unsigned' => false), // 1 = user, 2 = global
-		'start_date' => array('type' => 'datetime', 'null' => true, 'default' => null),
-		'end_date' => array('type' => 'datetime', 'null' => false, 'default' => '2100-01-01 00:00:01'),
-		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'affich' => array('type' => 'integer', 'null' => false, 'default' => '1', 'length' => 1, 'unsigned' => false),
-		'used' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+        'start_date' => array('type' => 'datetime', 'null' => true, 'default' => null),
+        'end_date' => array('type' => 'datetime', 'null' => false, 'default' => '2100-01-01 00:00:01'),
+        'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
+        'affich' => array('type' => 'integer', 'null' => false, 'default' => '1', 'length' => 1, 'unsigned' => false),
+        'used' => array('type' => 'text', 'null' => true, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
-	public $shop__vouchers_histories = array(
-		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
-		'code' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
-		'reduction' => array('type' => 'string', 'null' => false, 'length' => 3, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
-		'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
-		'indexes' => array(
-			'PRIMARY' => array('column' => 'id', 'unique' => 1)
-		),
-		'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
-	);
+    public $shop__vouchers_histories = array(
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => true, 'key' => 'primary'),
+        'code' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'user_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'unsigned' => false),
+        'reduction' => array('type' => 'string', 'null' => false, 'length' => 20, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'created' => array('type' => 'datetime', 'null' => false, 'default' => null),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
 
 }

From 3552b6f8e228d8bbff8694bb9627c61613191607 Mon Sep 17 00:00:00 2001
From: Valentin T <Eywek@users.noreply.github.com>
Date: Tue, 28 Jan 2020 11:16:51 +0100
Subject: [PATCH 34/45] Update config.json

---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.json b/config.json
index 6b862f5..2e8249a 100755
--- a/config.json
+++ b/config.json
@@ -37,7 +37,7 @@
 		"Boutique": "/shop"
 	},
 	"author":"Eywek",
-	"version":"1.2.19",
+	"version":"1.2.20",
 	"useEvents":true,
 	"permissions" : {
 		"available" : ["CREDIT_ACCOUNT", "CAN_BUY", "SHOP__ADMIN_MANAGE_ITEMS", "SHOP__ADMIN_MANAGE_CATEGORIES", "SHOP__ADMIN_MANAGE_VOUCHERS", "SHOP__ADMIN_MANAGE_PAYMENT", "SHOP__ADMIN_GIFTALL"],

From b29d0777b88eebc396900117816289debfeb7413 Mon Sep 17 00:00:00 2001
From: Valentin Touffet <contact@eywek.fr>
Date: Sun, 12 Jul 2020 17:33:13 +0200
Subject: [PATCH 35/45] fix: security issue

---
 Controller/PaymentController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Controller/PaymentController.php b/Controller/PaymentController.php
index 4c96b75..724563c 100755
--- a/Controller/PaymentController.php
+++ b/Controller/PaymentController.php
@@ -277,7 +277,7 @@ function transfer_points()
                     if ($this->User->exist($this->request->data['to'])) {
                         if (strtolower($this->User->getKey('pseudo')) != strtolower($this->request->data['to']) && $this->User->getKey('id') != $this->request->data['to']) {
                             $how = floatval($this->request->data['how']);
-                            if ($how > 0) {
+                            if ($how >= 1) { // Avoid to transfer 0.000000009 (-> 9.0E-9)
                                 $this->User->cacheQueries = false;
                                 $money_user = $this->User->find('first', array('conditions' => array('id' => $this->User->getKey('id'))))['User']['money'];
                                 $new_sold_user = $money_user - $how;

From abde4b78295b2dd56f4325f5f69538a45a31cd08 Mon Sep 17 00:00:00 2001
From: Valentin Touffet <contact@eywek.fr>
Date: Sun, 12 Jul 2020 17:33:58 +0200
Subject: [PATCH 36/45] chore: release 1.2.21

---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.json b/config.json
index 2e8249a..936c837 100755
--- a/config.json
+++ b/config.json
@@ -37,7 +37,7 @@
 		"Boutique": "/shop"
 	},
 	"author":"Eywek",
-	"version":"1.2.20",
+	"version":"1.2.21",
 	"useEvents":true,
 	"permissions" : {
 		"available" : ["CREDIT_ACCOUNT", "CAN_BUY", "SHOP__ADMIN_MANAGE_ITEMS", "SHOP__ADMIN_MANAGE_CATEGORIES", "SHOP__ADMIN_MANAGE_VOUCHERS", "SHOP__ADMIN_MANAGE_PAYMENT", "SHOP__ADMIN_GIFTALL"],

From 2cd91ca1b128b17e9e4a0c01db4d36e3ec69806a Mon Sep 17 00:00:00 2001
From: nivcoo <36514752+nivcoo@users.noreply.github.com>
Date: Fri, 18 Dec 2020 10:11:21 +0100
Subject: [PATCH 37/45] Add Section and sub-categories, new design and
 duplicate button (#39)

---
 Controller/CategoriesController.php           | 196 +++++-
 .../Component/DiscountVoucherComponent.php    |   3 +-
 Controller/PaymentController.php              |  25 +-
 Controller/ShopController.php                 | 392 +++++++----
 Model/Item.php                                |   6 +-
 Model/Section.php                             |   3 +
 SQL/schema.php                                |  12 +
 View/Categories/admin_add_category.ctp        |  79 ++-
 View/Categories/admin_add_section.ctp         |  30 +
 View/Categories/admin_edit.ctp                |  68 ++
 View/Categories/admin_index.ctp               | 169 ++++-
 View/Shop/admin_add_item.ctp                  | 599 ++++++++--------
 View/Shop/admin_edit.ctp                      | 655 +++++++++---------
 View/Shop/admin_index.ctp                     | 409 ++++++-----
 View/Shop/index.ctp                           |  30 +-
 config.json                                   |  16 +-
 lang/en_US.json                               | 539 +++++++-------
 lang/fr_FR.json                               |  27 +-
 18 files changed, 1965 insertions(+), 1293 deletions(-)
 create mode 100644 Model/Section.php
 create mode 100644 View/Categories/admin_add_section.ctp
 create mode 100644 View/Categories/admin_edit.ctp

diff --git a/Controller/CategoriesController.php b/Controller/CategoriesController.php
index 8057caf..dc23756 100644
--- a/Controller/CategoriesController.php
+++ b/Controller/CategoriesController.php
@@ -8,34 +8,96 @@ public function admin_index()
         if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_ITEMS')) {
             $this->set('title_for_layout', $this->Lang->get('SHOP__TITLE'));
             $this->layout = 'admin';
+            $this->loadModel('Shop.Section');
+            $search_sections = $this->Section->find('all');
             $this->loadModel('Shop.Category');
             $this->loadModel('Shop.Item');
-            $search_categories = $this->Category->find('all');
-            foreach ($search_categories as $v) {
+            $search_categories = $this->Category->find('all', array('conditions' => array('section' => 1)));
+            $i = 0;
+            if (!empty($search_categories)) foreach ($search_categories as $v) {
+                if (!$this->Section->find('first', array('conditions' => array('id' => $v['Category']['section_id'])))) {
+                    $search_categories_other[$i] = $this->Category->find('all', array('conditions' => array('id' => $v['Category']['id'])));
+                    if (!empty($search_categories_other)) foreach ($search_categories_other as $value) {
+                        $categories_count_other[$value[0]['Category']['id']] = $this->Item->find('count', array('conditions' => array('category' => $value[0]['Category']['id'])));
+                    }
+                }
+                $i++;
+            }
+            $this->loadModel('Shop.Item');
+            $search_categories_no = $this->Category->find('all', array('conditions' => array('section' => 0),'order' => 'order'));
+            if (!empty($search_categories_no)) foreach ($search_categories_no as $v) {
                 $categories_count[$v['Category']['id']] = $this->Item->find('count', array('conditions' => array('category' => $v['Category']['id'])));
             }
-            $this->set(compact('search_categories', 'categories_count'));
+            if (!empty($search_sections)) foreach ($search_sections as $va) {
+                $search_categories[$va["Section"]["id"]] = $this->Category->find('all', array('conditions' => array('section_id' => $va['Section']['id'], 'section' => 1),'order' => 'order'));
+                if (!empty($search_categories[$va["Section"]["id"]])) foreach ($search_categories[$va["Section"]["id"]] as $v) {
+                    $categories_count[$v['Category']['id']] = $this->Item->find('count', array('conditions' => array('category' => $v['Category']['id'])));
+                }
+            }
+            $this->set(compact('search_categories', 'categories_count', 'search_sections', 'search_categories_other', 'categories_count_other', 'search_categories_no'));
             
         }   else {
             $this->redirect('/');
         }
     }
-    
-    public function admin_edit_category()
+
+
+    public function admin_edit($id = false)
     {
-        $this->autoRender = false;
-        $this->response->type('json');
         if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_CATEGORIES')) {
+
+            $this->layout = 'admin';
+            $this->set('title_for_layout', $this->Lang->get('SHOP__CATEGORY_EDIT'));
+            $this->loadModel('Shop.Category');
+            $category = $this->Category->find('first', array('conditions' => array('id' => $id)));
+            $this->loadModel('Shop.Section');
+            $this->loadModel('Shop.Item');
+            $search_sections = $this->Section->find('all');
+            if (!empty($search_categories)) foreach ($search_categories as $v) {
+                $categories_count[$v['Category']['id']] = $this->Item->find('count', array('conditions' => array('category' => $v['Category']['id'])));
+            }
+            $this->set(compact('category', 'search_sections'));
+
             if ($this->request->is('post')) {
-                if (!empty($this->request->data['name'])) {
+                $section = $this->request->data['section'] || !empty($this->request->data['section_id']);
+                if (!empty($this->request->data['name']) AND $section) {
 
-                    $this->loadModel('Shop.Category');
-                    $this->Category->read(null, $this->request->data['id']);
+                    if (!$this->request->data['section']) $this->request->data['section_id'] = 0;
+
+                    $this->Category->read(null, $id);
                     $this->Category->set(array(
                         'name' => $this->request->data['name'],
+                        'section' => $this->request->data['section'],
+                        'section_id' => $this->request->data['section_id']
                     ));
+                    $this->History->set('ADD_CATEGORY', 'shop');
                     $this->Category->save();
-                    $this->response->body(json_encode(array('statut' => true, 'msg' => $this->Lang->get('SHOP__CATEGORY_EDIT_SUCCESS'))));
+                    $this->Session->setFlash($this->Lang->get('SHOP__CATEGORY_EDIT_SUCCESS'), 'default.success');
+                    $this->redirect(array('controller' => 'categories', 'action' => 'index', 'admin' => true));
+
+                } else {
+                    $this->Session->setFlash($this->Lang->get('ERROR__FILL_ALL_FIELDS'), 'default.error');
+                }
+            }
+        } else {
+            $this->redirect('/');
+        }
+    }
+
+    public function admin_edit_section()
+    {
+        $this->autoRender = false;
+        $this->response->type('json');
+        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_CATEGORIES')) {
+            if ($this->request->is('post')) {
+                if (!empty($this->request->data['name'])) {
+                    $this->loadModel('Shop.Section');
+                    $this->Section->read(null, $this->request->data['id']);
+                    $this->Section->set(array(
+                        'name' => $this->request->data['name'],
+                    ));
+                    $this->Section->save();
+                    $this->response->body(json_encode(array('statut' => true, 'msg' => $this->Lang->get('SHOP__SECTION_EDIT_SUCCESS'))));
                 } else {
                     $this->response->body(json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__FILL_ALL_FIELDS'))));
                 }
@@ -47,34 +109,126 @@ public function admin_edit_category()
         }
     }
     
+
+    public function admin_save_ajax()
+    {
+        $this->autoRender = false;
+        $this->response->type('json');
+        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_CATEGORIES')) {
+
+            if ($this->request->is('post')) {
+                if (!empty($this->request->data)) {
+                    $data = $this->request->data['shop_item_order'];
+                    $data = explode('&', $data);
+                    $i = 1;
+                    foreach ($data as $key => $value) {
+                        $data2[] = explode('=', $value);
+                        $data3 = substr($data2[0][0], 0, -2);
+                        $data1[$data3] = $i;
+                        unset($data3);
+                        unset($data2);
+                        $i++;
+                    }
+                    $data = $data1;
+                    $this->loadModel('Shop.Category');
+                    foreach ($data as $key => $value) {
+                        $find = $this->Category->find('first', array('conditions' => array('id' => $key)));
+                        if (!empty($find)) {
+                            $id = $find['Category']['id'];
+                            $this->Category->read(null, $id);
+                            $this->Category->set(array(
+                                'order' => $value,
+                            ));
+                            $this->Category->save();
+                        } else {
+                            $error = 1;
+                        }
+                    }
+                    if (empty($error)) {
+                        return $this->response->body(json_encode(array('statut' => true, 'msg' => $this->Lang->get('SHOP__SAVE_SUCCESS'))));
+					} else{
+                        return $this->response->body(json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__FILL_ALL_FIELDS'))));
+                    }
+                } else {
+                    return $this->response->body(json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__FILL_ALL_FIELDS'))));
+                }
+            } else {
+                return $this->response->body(json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__BAD_REQUEST'))));
+            }
+        } else {
+            $this->redirect('/');
+        }
+    }
+    
     /*
     * ======== Ajout d'une catégorie (affichage & traitement POST) ===========
     */
-    
-    public function admin_add_category()
+
+    public function admin_add_category($section_id = null)
     {
-        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_ITEMS')) {
+        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_CATEGORIES')) {
 
             $this->layout = 'admin';
             $this->set('title_for_layout', $this->Lang->get('SHOP__CATEGORY_ADD'));
+            $this->loadModel('Shop.Section');
+            $search_sections = $this->Section->find('all');
+            $this->set(compact('search_sections', 'section_id'));
+
             if ($this->request->is('post')) {
-                if (!empty($this->request->data['name'])) {
-                    $this->loadModel('Shop.Category');
+                $section = $this->request->data['section'] || !empty($this->request->data['section_id']);
+                if (!empty($this->request->data['name']) AND $section) {
 
-                    $event = new CakeEvent('beforeAddCategory', $this, array('category' => $this->request->data['name'], 'user' => $this->User->getAllFromCurrentUser()));
-                    $this->getEventManager()->dispatch($event);
-                    if ($event->isStopped()) {
-                        return $event->result;
-                    }
+                    $this->loadModel('Shop.Category');
+                    if (!$this->request->data['section']) $this->request->data['section_id'] = 0;
 
                     $this->Category->read(null, null);
                     $this->Category->set(array(
                         'name' => $this->request->data['name'],
+                        'section' => $this->request->data['section'],
+                        'section_id' => $this->request->data['section_id']
                     ));
                     $this->History->set('ADD_CATEGORY', 'shop');
                     $this->Category->save();
                     $this->Session->setFlash($this->Lang->get('SHOP__CATEGORY_ADD_SUCCESS'), 'default.success');
                     $this->redirect(array('controller' => 'categories', 'action' => 'index', 'admin' => true));
+
+                } else {
+                    $this->Session->setFlash($this->Lang->get('ERROR__FILL_ALL_FIELDS'), 'default.error');
+                }
+            }
+        } else {
+            $this->redirect('/');
+        }
+    }
+    
+    /*
+    * ======== Ajout d'une catégorie (affichage & traitement POST) ===========
+    */
+    
+    public function admin_add_section()
+    {
+        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_CATEGORIES')) {
+
+            $this->layout = 'admin';
+            $this->set('title_for_layout', $this->Lang->get('SHOP__CATEGORY_ADD'));
+            if ($this->request->is('post')) {
+                if (!empty($this->request->data['name'])) {
+                    $this->loadModel('Shop.Section');
+
+                    $event = new CakeEvent('beforeAddCategory', $this, array('section' => $this->request->data['name'], 'user' => $this->User->getAllFromCurrentUser()));
+                    $this->getEventManager()->dispatch($event);
+                    if ($event->isStopped()) {
+                        return $event->result;
+                    }
+
+                    $this->Section->read(null, null);
+                    $this->Section->set(array(
+                        'name' => $this->request->data['name']
+                    ));
+                    $this->History->set('ADD_SECTION', 'shop');
+                    $this->Section->save();
+                    $this->Session->setFlash($this->Lang->get('SHOP__SECTION_ADD_SUCCESS'), 'default.success');
+                    $this->redirect(array('controller' => 'categories', 'action' => 'index', 'admin' => true));
                 } else {
                     $this->Session->setFlash($this->Lang->get('ERROR__FILL_ALL_FIELDS'), 'default.error');
                 }
diff --git a/Controller/Component/DiscountVoucherComponent.php b/Controller/Component/DiscountVoucherComponent.php
index b187ee0..1a88e27 100755
--- a/Controller/Component/DiscountVoucherComponent.php
+++ b/Controller/Component/DiscountVoucherComponent.php
@@ -182,7 +182,7 @@ private function canUse($voucher)
         return false;
     }
 
-    function getNewPrice($item_id, $code)
+    function getNewPrice($item_id, $itemPrice, $code)
     { // donne le nouveau prix de l'item si il est concerné par une réduction
         $this->Voucher = ClassRegistry::init('Shop.Voucher');
         $findVoucher = $this->Voucher->find('first', array('conditions' => array('code' => $code)));
@@ -200,7 +200,6 @@ function getNewPrice($item_id, $code)
                     return array('status' => false, 'error' => 3); // on trouve pas l'article
                 }
 
-                $itemPrice = $findItem['Item']['price'];
                 $itemCategoryID = $findItem['Item']['category'];
 
                 // On prépare le prix si pas de modifications
diff --git a/Controller/PaymentController.php b/Controller/PaymentController.php
index 724563c..fe2648b 100755
--- a/Controller/PaymentController.php
+++ b/Controller/PaymentController.php
@@ -509,12 +509,12 @@ public function admin_paysafecard_invalid($id = false)
                     $this->History->set('INVALID_PAYSAFECARD', 'shop');
 
                     $this->Session->setFlash($this->Lang->get('SHOP__PAYSAFECARD_INVALID_SUCCESS'), 'default.success');
-                    $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+                    $this->redirect(array('action' => 'index', 'admin' => true));
                 } else {
-                    $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+                    $this->redirect(array('action' => 'index', 'admin' => true));
                 }
             } else {
-                $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+                $this->redirect(array('action' => 'index', 'admin' => true));
             }
         } else {
             $this->redirect('/');
@@ -549,6 +549,7 @@ public function paysafecard()
                                         'code' => $codes,
                                         'user_id' => $this->User->getKey('id')
                                     ));
+
                                     $this->Paysafecard->save();
 
                                     $this->loadModel('Notification');
@@ -648,10 +649,10 @@ public function admin_edit_paypal($id = false)
                     $this->set(compact('id'));
                     $this->set('paypal', $search[0]['Paypal']);
                 } else {
-                    $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+                    $this->redirect(array('action' => 'index', 'admin' => true));
                 }
             } else {
-                $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+                $this->redirect(array('action' => 'index', 'admin' => true));
             }
         } else {
             $this->redirect('/');
@@ -890,10 +891,10 @@ public function admin_edit_starpass($id = false)
                     $this->set(compact('id'));
                     $this->set('starpass', $search[0]['Starpass']);
                 } else {
-                    $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+                    $this->redirect(array('action' => 'index', 'admin' => true));
                 }
             } else {
-                $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+                $this->redirect(array('action' => 'index', 'admin' => true));
             }
         } else {
             $this->redirect('/');
@@ -1051,13 +1052,13 @@ public function starpass_verif()
                     $this->StarpassHistory->save();
 
                     $this->Session->setFlash($this->Lang->get('SHOP__STARPASS_PAYMENT_SUCCESS'), 'default.success');
-                    $this->redirect(array('controller' => 'shop', 'action' => 'index'));
+                    $this->redirect(array('action' => 'index', 'admin' => true));
                 }
             } else {
-                $this->redirect(array('controller' => 'shop', 'action' => 'index'));
+                $this->redirect(array('action' => 'index', 'admin' => true));
             }
         } else {
-            $this->redirect(array('controller' => 'shop', 'action' => 'index'));
+            $this->redirect(array('action' => 'index', 'admin' => true));
         }
     }
 
@@ -1493,7 +1494,7 @@ public function dedipass_ipn()
                         }
                         
                         $this->Session->setFlash($this->Lang->get('SHOP__DEDIPASS_PAYMENT_SUCCESS', array('{MONEY}' => $virtual_currency, '{MONEY_NAME}' => $this->Configuration->getMoneyName())), 'default.success');
-                        $this->redirect(array('controller' => 'shop', 'action' => 'index'));
+                        $this->redirect(array('action' => 'index', 'admin' => true));
 
                     } else {
                         $this->Session->setFlash($this->Lang->get('SHOP__DEDIPASS_PAYMENT_ERROR_INVAID_CODE'), 'default.error');
@@ -1502,7 +1503,7 @@ public function dedipass_ipn()
 
                 } else {
                     $this->Session->setFlash($this->Lang->get('SHOP__DEDIPASS_PAYMENT_ERROR_NOT_CONNECTED', array('{CODE}' => $code)), 'default.error');
-                    $this->redirect(array('controller' => 'shop', 'action' => 'index'));
+                    $this->redirect(array('action' => 'index', 'admin' => true));
                 }
             }
         }
diff --git a/Controller/ShopController.php b/Controller/ShopController.php
index 0e1bb30..e9f6921 100755
--- a/Controller/ShopController.php
+++ b/Controller/ShopController.php
@@ -16,7 +16,7 @@ function index($category = false)
         if ($category) {
             $this->set(compact('category'));
         }
-		
+
         $this->layout = $this->Configuration->getKey('layout'); // On charge le thème configuré
         $this->loadModel('Shop.Item'); // le model des articles
         $this->loadModel('Shop.Category'); // le model des catégories
@@ -30,71 +30,94 @@ function index($category = false)
                   )
               )
             )); // on cherche tous les items et on envoie à la vue
-        $vanow = 0;
         $this->loadModel('Shop.DedipassHistory');
         $this->loadModel('Shop.PaypalHistory');
-        $this->loadModel('Shop.NanoHistory');
         $this->loadModel('Shop.StarpassHistory');
         $this->loadModel('Shop.PaysafecardHistory');
-        $histories_dedi = $this->DedipassHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
-        $histories_paypal = $this->PaypalHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
-        $this->loadModel('Shop.Nano');
-        try {           
-            $nano_offers = $this->Nano->find('all');
-            $histories_nano = $this->NanoHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
-        } catch (\Throwable $th) {
-            $this->Nano->init($this);
-        }
-        $histories_pay = $this->PaysafecardHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
-        $histories_star = $this->StarpassHistory->find('all',['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
-        foreach ($histories_dedi as $value){
-          $vanow +=  floatval($value["DedipassHistory"]["credits_gived"]);
-        }
-        foreach ($histories_paypal as $value){
-          $vanow +=  floatval($value["PaypalHistory"]["payment_amount"]);
+
+        $histories_dedi = $this->DedipassHistory->find('all', ['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
+        $histories_paypal = $this->PaypalHistory->find('all', ['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
+        $histories_pay = $this->PaysafecardHistory->find('all', ['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
+        $histories_star = $this->StarpassHistory->find('all', ['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
+
+        $best_donator_price = [];
+
+        foreach ($histories_dedi as $value) {
+            $money = $value["DedipassHistory"]["credits_gived"];
+            $goal_money += floatval($money);
+            $id = $value["DedipassHistory"]["user_id"];
+            if (!isset($best_donator_price[$id]))
+                $best_donator_price[$id] = 0;
+            $best_donator_price[$id] += $money;
         }
-        foreach ($histories_nano as $value){
-          $vanow +=  floatval($value["NanoHistory"]["payment_amount"]);
+        foreach ($histories_paypal as $value) {
+            $money = $value["PaypalHistory"]["payment_amount"];
+            $goal_money += floatval($money);
+
+            $id = $value["PaypalHistory"]["user_id"];
+            if (!isset($best_donator_price[$id]))
+                $best_donator_price[$id] = 0;
+            $best_donator_price[$id] += $money;
         }
-        foreach ($histories_pay as $value){
-          $vanow +=  floatval($value["PaysafecardHistory"]["credits_gived"]);
+        foreach ($histories_pay as $value) {
+            $money = $value["PaysafecardHistory"]["credits_gived"];
+            $goal_money += floatval($money);
+            $id = $value["PaysafecardHistory"]["user_id"];
+            if (!isset($best_donator_price[$id]))
+                $best_donator_price[$id] = 0;
+            $best_donator_price[$id] += $money;
         }
-        foreach ($histories_star as $value){
-          $vanow +=  floatval($value["StarpassHistory"]["credits_gived"]);
+
+        foreach ($histories_star as $value) {
+            $money = $value["StarpassHistory"]["credits_gived"];
+            $goal_money += floatval($money);
+            $id = $value["StarpassHistory"]["user_id"];
+            if (!isset($best_donator_price[$id]))
+                $best_donator_price[$id] = 0;
+            $best_donator_price[$id] += $money;
         }
         $this->loadModel('Shop.ItemsConfig');
-        $vagoal = $this->ItemsConfig->find('all');
-        $vagoal = @$vagoal[0]["ItemsConfig"]["goal"];
-        if ($vanow > $vagoal){
-          $vanow = $vagoal;
+        $goal_money_max = $this->ItemsConfig->find('first')["ItemsConfig"]["goal"];
+        if ($goal_money > $goal_money_max) {
+            $goal_money = $goal_money_max;
         }
-        if ($vagoal != 0){
-          $vawidth = round((str_replace(",", '.', $vanow*100/$vagoal)));
+        if ($goal_money_max != 0) {
+            $goal_bar_with = round((str_replace(",", '.', $goal_money * 100 / $goal_money_max)));
         }
-            
-        $best_donator_price = array();
 
-        foreach($histories_dedi as $get) {
-            $best_donator_price[$get["DedipassHistory"]["user_id"]] += $get["DedipassHistory"]["credits_gived"];
-        }
-        foreach($histories_paypal as $get) {
-            $best_donator_price[$get["PaypalHistory"]["user_id"]] += $get["PaypalHistory"]["credits_gived"];
-        }
-        foreach($histories_nano as $get) {
-            $best_donator_price[$get["NanoHistory"]["user_id"]] += $get["NanoHistory"]["credits_gived"];
-        }
-        foreach($histories_pay as $get) {
-            $best_donator_price[$get["PaysafecardHistory"]["user_id"]] += $get["PaysafecardHistory"]["credits_gived"];
+        $best_donator_exclude = array_diff_key($best_donator_price, [3 => 0, 1606 => 0]);
+
+
+        $i = 0;
+        foreach ($best_donator_exclude as $key => $value) {
+            if ($i == 3)
+                break;
+            $best_donator_id = array_search(max($best_donator_exclude), $best_donator_exclude);
+            $best_donator[] = $this->User->find('first', ['conditions' => ['id' => $best_donator_id]]);
+
+            $best_donator_exclude = array_diff_key($best_donator_exclude, [$best_donator_id => $best_donator_exclude[$best_donator_id]]);
+            $i++;
         }
-        foreach($histories_star as $get) {
-            $best_donator_price[$get["StarpassHistory"]["user_id"]] += $get["StarpassHistory"]["credits_gived"];
+
+
+        //$best_donator_id = array_search(max($best_donator_exclude), $best_donator_exclude);
+        //$best_donator = $this->User->find('all', ['conditions' => ['id' => $best_donator_id], 'limit' => 5]);
+        //$best_donator = $best_donator;
+
+
+        $this->loadModel('Shop.Section');
+        $search_sections = $this->Section->find('all');
+        $search_categories_without_section = $this->Category->find('all', array('conditions' => array('section' => 0), 'order' => 'order'));
+        $search_categories_section = [];
+        $search_categories = [];
+        if (!empty($search_sections)) foreach ($search_sections as $v) {
+            $search_categories_section[$v['Section']['id']] = $this->Category->find('all', array('conditions' => array('section_id' => $v['Section']['id'], 'section' => 1), 'order' => 'order'));
+            $search_categories = $this->Category->find('all');
         }
-        $best_donator_id = array_search(max($best_donator_price),$best_donator_price);
-        $best_donator = $this->User->find('first', ['conditions' => ['id' => $best_donator_id]]);
-        $best_donator = $best_donator['User'];
 		
         $search_categories = $this->Category->find('all'); // on cherche toutes les catégories et on envoie à la vue
 
+
         $search_first_category = $this->Category->find('first'); //
         $search_first_category = @$search_first_category['Category']['id']; //
 
@@ -129,8 +152,8 @@ function index($category = false)
 
         $singular_money = $this->Configuration->getMoneyName(false);
         $plural_money = $this->Configuration->getMoneyName();
+        $this->set(compact('best_donator', 'dedipass', 'goal_money_max', 'goal_bar_with', 'paysafecard_enabled', 'money', 'starpass_offers', 'paypal_offers', 'nano_offers', 'search_first_category', 'search_categories', 'search_categories_without_section', 'search_categories_section', 'search_sections', 'search_items', 'title_for_layout', 'vouchers', 'singular_money', 'plural_money'));
 
-        $this->set(compact('best_donator', 'dedipass', 'vagoal', 'vawidth', 'paysafecard_enabled', 'money', 'starpass_offers', 'paypal_offers', 'nano_offers', 'search_first_category', 'search_categories', 'search_items', 'title_for_layout', 'vouchers', 'singular_money', 'plural_money'));
     }
 
     /*
@@ -182,7 +205,7 @@ function ajax_get($id = null)
                 $reductional_items_list_display = array();
                 // on parcours tous les articles pour voir si ils ont été achetés
                 $reductional_items = true; // de base on dis que c'est okay
-                $reduction = 0; // 0 de réduction
+                $reduction = 0; //  0 de réduction
                 foreach ($reductional_items_list as $key => $value) {
 
                     $findItem = $this->Item->find('first', array('conditions' => array('id' => $value)));
@@ -191,29 +214,38 @@ function ajax_get($id = null)
                         break;
                     }
 
+                    $reduction = $this->Item->getReductionWithReductionalItems($search_item[0]['Item'], $this->User->getKey('id'));
+                    if (floatval($reduction) == "0") {
+                        $reductional_items = false;
+                        break;
+                    }
+
                     $findHistory = $this->ItemsBuyHistory->find('first', array('conditions' => array('user_id' => $this->User->getKey('id'), 'item_id' => $findItem['Item']['id'])));
                     if (empty($findHistory)) {
-                        $reductional_items = false;
                         break;
                     }
 
-                    $reduction = +$findItem['Item']['price'];
+
                     $reductional_items_list_display[] = $findItem['Item']['name'];
 
                     unset($findItem);
 
+
                 }
+                $item_price -= $reduction;
 
                 if ($reductional_items) {
-                    $item_price = floor($item_price - $reduction);
 
                     $reduction = $reduction . ' ' . $this->Configuration->getMoneyName();
                     $reductional_items_list = '<i>' . implode('</i>, <i>', $reductional_items_list_display) . '</i>';
+
                     $reductional_items_list = $this->Lang->get('SHOP__ITEM_REDUCTIONAL_ITEMS_LIST', array('{ITEMS_LIST}' => $reductional_items_list, '{REDUCTION}' => $reduction));
 
                 }
+
             }
 
+
             $add_to_cart = (!empty($search_item[0]['Item']['cart']) && $search_item[0]['Item']['cart']) ? true : false;
 
             //On récupére l'element
@@ -243,7 +275,7 @@ function ajax_get($id = null)
 
             $vars = array(
                 '{ITEM_NAME}' => $search_item['0']['Item']['name'],
-                '{ITEM_DESCRIPTION}' => nl2br($search_item['0']['Item']['description']),
+                '{ITEM_DESCRIPTION}' => $search_item['0']['Item']['description'],
                 '{ITEM_SERVERS}' => $servers,
                 '{ITEM_PRICE}' => $item_price,
                 '{SITE_MONEY}' => $money,
@@ -322,27 +354,29 @@ public function checkVoucher($code = null, $items_id = null, $quantities = 1)
                     $total_price += $findItem['Item']['price'] * $quantity;
 
                     $i = 0;
+
+                    /*
+                        On gère les réductions de prix
+                    */
+
+                    $reduction = $this->Item->getReductionWithReductionalItems($findItem['Item'], $this->User->getKey('id'));
                     while ($i < $quantity) {
 
-                        $getVoucherPrice = $this->DiscountVoucher->getNewPrice($findItem['Item']['id'], $code);
+                        /*
+                            On gère le nouveau prix
+                        */
+                        $new_price = $total_price - $reduction;
+
+
+                        $getVoucherPrice = $this->DiscountVoucher->getNewPrice($findItem['Item']['id'], $new_price, $code);
+
 
                         if ($getVoucherPrice['status']) {
-                            $new_price = $new_price + $getVoucherPrice['price'];
-                        } else {
-                            $new_price = $new_price + $findItem['Item']['price']; // erreur
+                            $new_price = $getVoucherPrice['price'];
                         }
 
                         $i++;
                     }
-
-
-                    /*
-                        On gère les réductions de prix
-                    */
-                    $reduction = $this->Item->getReductionWithReductionalItems($findItem['Item'], $this->User->getKey('id'));
-                    // on effectue la reduction
-                    $new_price = $new_price - $reduction * $quantity;
-
                     if ($new_price < 0) {
                         $new_price = 0;
                     }
@@ -459,8 +493,12 @@ function buy_ajax()
                 $giveCape = true;
 
             // Voucher
+            // Reductionnal price
+            $reduction = $this->Item->getReductionWithReductionalItems($item, $this->User->getKey('id'));
+            $item['price'] -= $reduction;
+
             if (!empty($voucher)) {
-                $getVoucherPrice = $this->DiscountVoucher->getNewPrice($item['id'], $voucher);
+                $getVoucherPrice = $this->DiscountVoucher->getNewPrice($item['id'], $item['price'], $voucher);
 
                 if ($getVoucherPrice['status']) {
                     $voucherUsedCount++;
@@ -469,21 +507,18 @@ function buy_ajax()
                 }
             }
 
-            // Reductionnal price
-            $reduction = $this->Item->getReductionWithReductionalItems($item, $this->User->getKey('id'));
-            $item['price'] -= $reduction;
 
             // Add to items (for quantity)
             for ($i = 1; $i <= $itemData['quantity']; $i++) {
                 if ($i == $itemData['quantity'] && $item['broadcast_global']) { // Broadcast global only on last (avoid multiple global message)
                     $item['commands'] = "{$item['commands']}[{+}]" . strtr($config['broadcast_global'], [
-                        '{PLAYER}' => $this->User->getKey('pseudo'),
-                        '{QUANTITY}' => $itemData['quantity'],
-                        '{ITEM_NAME}' => $item['name'],
-                        '{SERVERNAME}' => implode(', ', array_map(function ($server) {
-                            return $server['Server']['name'];
-                        }, ClassRegistry::init('Server')->find('all', ['conditions' => ['id' => $item['servers']]])))
-                    ]);
+                            '{PLAYER}' => $this->User->getKey('pseudo'),
+                            '{QUANTITY}' => $itemData['quantity'],
+                            '{ITEM_NAME}' => $item['name'],
+                            '{SERVERNAME}' => implode(', ', array_map(function ($server) {
+                                return $server['Server']['name'];
+                            }, ClassRegistry::init('Server')->find('all', ['conditions' => ['id' => $item['servers']]])))
+                        ]);
                 }
                 $items[] = $item;
                 // Add to total price
@@ -567,30 +602,37 @@ public function admin_index()
             $this->loadModel('Server');
             $search_items = $this->Item->find('all', array('order' => 'order'));
             $items = array();
-            $item_server = array();
-            foreach ($search_items as $key => $value) {
-                if (!$this->Category->find('first', array('conditions' => array('id' => $value['Item']['category'])))) {
-                    $search_items_other = $this->Item->find('all', array('conditions' => array('category' => $value['Item']['category'])));
-
-                    $search_server = $this->Server->find('all', array('conditions' => array('id' => unserialize($value['Item']['servers']))));
-                    foreach ($search_server as $v) {
-                        $item_server[$value['Item']['id']] .= $v['Server']['name'];
-                        $item_server[$value['Item']['id']] .= ', ';
-                    }
+            if (!empty($search_items)) foreach ($search_items as $key => $v) {
+                if (!$this->Category->find('first', array('conditions' => array('id' => $v['Item']['category'])))) {
+                    $search_items_other = $this->Item->find('all', array('conditions' => array('category' => $v['Item']['category'])));
                 }
-                $items[$value['Item']['id']] = $value['Item']['name'];
+                $search_server = $this->Server->find('all', array('conditions' => array('id' => unserialize($v['Item']['servers']))));
+                $item_server[$v['Item']['id']] = implode(', ', array_map(function ($server) {
+                    return $server['Server']['name'];
+                }, $search_server));
+                $items[$v['Item']['id']] = $v['Item']['name'];
             }
-
+            $this->loadModel('Shop.Section');
+            $search_sections = $this->Section->find('all');
             $search_categories = $this->Category->find('all');
-            foreach ($search_categories as $v) {
-                $categories[$v['Category']['id']]['name'] = $v['Category']['name'];
+            if (!empty($search_categories)) foreach ($search_categories as $v) {
+                $search_items[$v['Category']['id']] = $this->Item->find('all', array('conditions' => array('category' => $v['Category']['id']), 'order' => 'order'));
+
+            }
+            if (!empty($search_sections)) foreach ($search_sections as $v) {
+                $search_categories["section-id-" . $v['Section']['id']] = $this->Category->find('all', array('conditions' => array('section' => 1, 'section_id' => $v['Section']['id']), 'order' => 'order'));
             }
+            $search_categories_without_section = $this->Category->find('all', array('conditions' => array('section' => 0), 'order' => 'order'));
+            if (!empty($search_categories_without_section)) foreach ($search_categories_without_section as $v) {
+                $search_items[$v['Category']['id']] = $this->Item->find('all', array('conditions' => array('category' => $v['Category']['id']), 'order' => 'order'));
+            }
+
 
             $this->loadModel('Shop.ItemsConfig');
             $findConfig = $this->ItemsConfig->find('first');
             $config = (!empty($findConfig)) ? $findConfig['ItemsConfig'] : array();
 
-            $this->set(compact('categories', 'search_categories', 'search_items', 'config', 'items', 'search_items_other', 'item_server'));
+            $this->set(compact('categories', 'search_categories', 'search_items', 'config', 'items', 'search_items_other', 'item_server', 'search_sections', 'search_categories_without_section'));
 
         } else {
             $this->redirect('/');
@@ -610,7 +652,7 @@ public function admin_get_histories_buy()
             $this->modelClass = 'ItemsBuyHistory';
             $this->DataTable->initialize($this);
             $this->paginate = array(
-                'fields' => array('ItemsBuyHistory.created', 'Item.name', 'User.pseudo'),
+                'fields' => array('ItemsBuyHistory.created', 'Item.name', 'User.pseudo', 'User.UUID'),
                 'order' => 'ItemsBuyHistory.id DESC',
                 'recursive' => 1
             );
@@ -629,15 +671,16 @@ public function admin_get_histories_buy()
     /*
     * ======== Page principale du panel admin ===========
     */
-	public function admin_save_ajax()
+    public function admin_save_ajax()
     {
         $this->autoRender = false;
-        if ($this->isConnected AND $this->Permissions->can('MANAGE_NAV')) {
+        $this->response->type('json');
+        if ($this->isConnected and $this->Permissions->can('SHOP__ADMIN_MANAGE_ITEMS')) {
 
             if ($this->request->is('post')) {
                 if (!empty($this->request->data)) {
-                    $data = $this->request->data['shop_item_order'];
-                    $data = explode('&', $data);
+                    $data = htmlspecialchars($this->request->data['shop_item_order']);
+                    $data = explode('&amp;', $data);
                     $i = 1;
                     foreach ($data as $key => $value) {
                         $data2[] = explode('=', $value);
@@ -650,34 +693,29 @@ public function admin_save_ajax()
                     $data = $data1;
                     $this->loadModel('Shop.Item');
                     foreach ($data as $key => $value) {
-                        $find = $this->Item->find('first', array('conditions' => array('name' => $key)));
-                        if (!empty($find)) {
-                            $id = $find['Item']['id'];
-                            $this->Item->read(null, $id);
-                            $this->Item->set(array(
-                                'order' => $value,
-                            ));
-                            $this->Item->save();
-                        } else {
-                            $error = 1;
-                        }
-                    }
-                    if (empty($error)) {
-						return $this->sendJSON(['statut' => true, 'msg' => $this->Lang->get('SHOP__SAVE_SUCCESS')]);
-					} else{
-                        return $this->sendJSON(['statut' => false, 'msg' => $this->Lang->get('ERROR__FILL_ALL_FIELDS')]);
+                        $find = $this->Item->find('first', array('conditions' => array('id' => $key)));
+                        if (empty($find))
+                            return $this->response->body(json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__BAD_REQUEST'))));
+                        $id = $find['Item']['id'];
+                        $this->Item->read(null, $id);
+                        $this->Item->set(array(
+                            'order' => $value,
+                        ));
+                        $this->Item->save();
                     }
+
+                    return $this->response->body(json_encode(array('statut' => true, 'msg' => $this->Lang->get('SHOP__SAVE_SUCCESS'))));
                 } else {
-					return $this->sendJSON(['statut' => false, 'msg' => $this->Lang->get('ERROR__FILL_ALL_FIELDS')]);
+                    return $this->response->body(json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__FILL_ALL_FIELDS'))));
                 }
             } else {
-				return $this->sendJSON(['statut' => false, 'msg' => $this->Lang->get('ERROR__BAD_REQUEST')]);
-
+                return $this->response->body(json_encode(array('statut' => false, 'msg' => $this->Lang->get('ERROR__BAD_REQUEST'))));
             }
         } else {
             $this->redirect('/');
         }
     }
+
     public function admin_config_items()
     {
         $this->autoRender = false;
@@ -694,9 +732,9 @@ public function admin_config_items()
                     $this->ItemsConfig->read(null, 1);
                 }
                 $this->ItemsConfig->set(array(
-                        'goal' => $this->request->data['goal'],
-			'broadcast_global' => $this->request->data['broadcast_global']
-                    ));
+                    'goal' => $this->request->data['goal'],
+                    'broadcast_global' => $this->request->data['broadcast_global']
+                ));
                 $this->ItemsConfig->save();
 
                 $this->response->body(json_encode(array('statut' => true, 'msg' => $this->Lang->get('SHOP__CONFIG_SAVE_SUCCESS'))));
@@ -727,17 +765,15 @@ public function admin_edit($id = false)
                 if (!empty($item)) {
                     $item = $item[0]['Item'];
                     $this->loadModel('Shop.Category');
-                    $item['category'] = $this->Category->find('all', array('conditions' => array('id' => $item['category'])));
-                    $item['category'] = $item['category'][0]['Category']['name'];
+                    $this->loadModel('Shop.Section');
+                    $item['category'] = $this->Category->find('first', array('conditions' => array('id' => $item['category'])));
+                    $item['category'] = $item['category']['Category']['id'];
 
-                    $search_categories = $this->Category->find('all', array('fields' => 'name'));
-                    $categories = array();
+                    $search_categories = $this->Category->find('all', array('order' => 'section_id'));
                     foreach ($search_categories as $v) {
-                        if ($v['Category']['name'] != $item['category']) {
-                            $categories[$v['Category']['name']] = $v['Category']['name'];
-                        }
+                        $section[$v['Category']['section_id']] = $this->Section->find('first', array('conditions' => array('id' => $v['Category']['section_id'])));
                     }
-                    $this->set(compact('categories'));
+                    $this->set(compact('section', 'search_categories'));
 
                     $search_items = $this->Item->find('all', array('fields' => array('name', 'id')));
                     $items_available = array();
@@ -813,8 +849,6 @@ public function admin_edit_ajax()
                 }
                 if (!empty($this->request->data['id']) AND !empty($this->request->data['name']) AND !empty($this->request->data['description']) AND !empty($this->request->data['category']) AND strlen($this->request->data['price']) > 0 AND !empty($this->request->data['servers']) AND !empty($this->request->data['commands']) AND !empty($this->request->data['timedCommand'])) {
                     $this->loadModel('Shop.Category');
-                    $this->request->data['category'] = $this->Category->find('all', array('conditions' => array('name' => $this->request->data['category'])));
-                    $this->request->data['category'] = $this->request->data['category'][0]['Category']['id'];
                     $this->request->data['timedCommand'] = ($this->request->data['timedCommand'] == 'true') ? 1 : 0;
                     if (!$this->request->data['timedCommand']) {
                         $this->request->data['timedCommand_cmd'] = NULL;
@@ -881,19 +915,19 @@ public function admin_edit_ajax()
     * ======== Ajout d'un article (affichage) ===========
     */
     
-    public function admin_add_item()
+    public function admin_add_item($category_id = null)
     {
         if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_ITEMS')) {
 
             $this->set('title_for_layout', $this->Lang->get('SHOP__ITEM_ADD'));
             $this->layout = 'admin';
             $this->loadModel('Shop.Category');
-            $search_categories = $this->Category->find('all', array('fields' => 'name'));
-            $categories = array();
+            $this->loadModel('Shop.Section');
+            $search_categories = $this->Category->find('all', array('order' => 'section_id'));
             foreach ($search_categories as $v) {
-                $categories[$v['Category']['name']] = $v['Category']['name'];
+                $section[$v['Category']['section_id']] = $this->Section->find('first', array('conditions' => array('id' => $v['Category']['section_id'])));
             }
-            $this->set(compact('categories'));
+            $this->set(compact('section', 'search_categories', 'category_id'));
 
             $this->loadModel('Shop.Item');
             $search_items = $this->Item->find('all', array('fields' => array('name', 'id')));
@@ -911,7 +945,6 @@ public function admin_add_item()
             $this->redirect('/');
         }
     }
-    
     /*
     * ======== Ajout d'un article (Traitement AJAX) ===========
     */
@@ -925,8 +958,6 @@ public function admin_add_item_ajax()
 
                 if (!empty($this->request->data['name']) AND !empty($this->request->data['description']) AND !empty($this->request->data['category']) AND strlen($this->request->data['price']) > 0 AND !empty($this->request->data['servers']) AND !empty($this->request->data['commands']) AND !empty($this->request->data['timedCommand'])) {
                     $this->loadModel('Shop.Category');
-                    $this->request->data['category'] = $this->Category->find('all', array('conditions' => array('name' => $this->request->data['category'])));
-                    $this->request->data['category'] = $this->request->data['category'][0]['Category']['id'];
                     $this->request->data['timedCommand'] = ($this->request->data['timedCommand'] == 'true') ? 1 : 0;
                     if (!$this->request->data['timedCommand']) {
                         $this->request->data['timedCommand_cmd'] = NULL;
@@ -990,6 +1021,69 @@ public function admin_add_item_ajax()
     }
 
     /*
+   * ======== Duplication d'un article (Traitement AJAX) ===========
+   */
+
+    public function admin_duplicate($id = false)
+    {
+        $this->autoRender = false;
+        if ($this->isConnected AND $this->Permissions->can('SHOP__ADMIN_MANAGE_ITEMS')) {
+            if ($id != false) {
+                $this->loadModel('Shop.Item');
+                $this->request->data = $this->Item->find('first', array('conditions' => array('id' => $id)))['Item'];
+
+                if (!empty($this->request->data['name']) AND !empty($this->request->data['description']) AND !empty($this->request->data['category']) AND strlen($this->request->data['price']) > 0 AND !empty($this->request->data['servers']) AND !empty($this->request->data['commands'])) {
+                    $this->loadModel('Shop.Category');
+
+                    $event = new CakeEvent('beforeAddItem', $this, array('data' => $this->request->data, 'user' => $this->User->getAllFromCurrentUser()));
+                    $this->getEventManager()->dispatch($event);
+                    if ($event->isStopped()) {
+                        return $event->result;
+                    }
+
+                    $this->Item->read(null, null);
+                    $this->Item->set(array(
+                        'name' => $this->request->data['name'],
+                        'description' => $this->request->data['description'],
+                        'category' => $this->request->data['category'],
+                        'price' => $this->request->data['price'],
+                        'servers' => $this->request->data['servers'],
+                        'commands' => $this->request->data['commands'],
+                        'img_url' => $this->request->data['img_url'],
+                        'timedCommand' => $this->request->data['timedCommand'],
+                        'timedCommand_cmd' => $this->request->data['timedCommand_cmd'],
+                        'timedCommand_time' => $this->request->data['timedCommand_time'],
+                        'display_server' => $this->request->data['display_server'],
+                        'need_connect' => $this->request->data['need_connect'],
+                        'display' => $this->request->data['display'],
+                        'multiple_buy' => $this->request->data['multiple_buy'],
+                        'broadcast_global' => $this->request->data['broadcast_global'],
+                        'cart' => $this->request->data['cart'],
+                        'prerequisites_type' => $this->request->data['prerequisites_type'],
+                        'prerequisites' => $this->request->data['prerequisites'],
+                        'reductional_items' => $this->request->data['reductional_items'],
+                        'give_skin' => $this->request->data['give_skin'],
+                        'give_cape' => $this->request->data['give_cape'],
+                        'buy_limit' => $this->request->data['buy_limit'],
+                        'wait_time' => $this->request->data['wait_time']
+                    ));
+                    $this->Item->save();
+                    $this->History->set('ADD_ITEM', 'shop');
+                    $this->Session->setFlash($this->Lang->get('SHOP__ITEM_DUPLICATE_SUCCESS'), 'default.success');
+                    $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+                } else {
+                    $this->Session->setFlash($this->Lang->get('ERROR__FILL_ALL_FIELDS'), 'default.error');
+                    $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+                }
+
+            } else {
+                $this->redirect(array('controller' => 'shop', 'action' => 'index', 'admin' => true));
+            }
+        } else {
+            throw new ForbiddenException();
+        }
+    }
+    /*
     * ======== Suppression d'une catégorie/article/paypal/starpass (traitement) ===========
     */
 
@@ -1035,6 +1129,26 @@ public function admin_delete($type = false, $id = false)
                     } else {
                         $this->Session->setFlash($this->Lang->get('UNKNONW_ID'), 'default.error');
                         $this->redirect(array('controller' => 'categories', 'action' => 'index', 'admin' => true));
+
+                    }
+                } elseif ($type == "section") {
+                    $this->loadModel('Shop.Section');
+                    $find = $this->Section->find('all', array('conditions' => array('id' => $id)));
+                    if (!empty($find)) {
+
+                        $event = new CakeEvent('beforeDeleteCategory', $this, array('section_id' => $id, 'user' => $this->User->getAllFromCurrentUser()));
+                        $this->getEventManager()->dispatch($event);
+                        if ($event->isStopped()) {
+                            return $event->result;
+                        }
+
+                        $this->Section->delete($id);
+                        $this->History->set('DELETE_SECTION', 'shop');
+                        $this->Session->setFlash($this->Lang->get('SHOP__SECTION_DELETE_SUCCESS'), 'default.success');
+                        $this->redirect(array('controller' => 'categories', 'action' => 'index', 'admin' => true));
+                    } else {
+                        $this->Session->setFlash($this->Lang->get('UNKNONW_ID'), 'default.error');
+                        $this->redirect(array('controller' => 'categories', 'action' => 'index', 'admin' => true));
                     }
                 } elseif ($type == "paypal") {
                     $this->loadModel('Shop.Paypal');
diff --git a/Model/Item.php b/Model/Item.php
index c4b9f60..46c7905 100755
--- a/Model/Item.php
+++ b/Model/Item.php
@@ -53,11 +53,12 @@ public function checkPrerequisites($item, $user_id)
     public function getReductionWithReductionalItems($item, $user_id)
     {
         $reduction = 0;
-        if (empty($item['reductional_items']) || !is_array(($reductionsItems = unserialize($item['reductional_items']))))
+        if (empty($item['reductional_items']) || !is_array(($reductionsItems = array_reverse(unserialize($item['reductional_items'])))))
             return $reduction;
 
+
         foreach ($reductionsItems as $itemId) {
-            $findItem = $this->find('first', array('conditions' => array('id' => $itemId)));
+            $findItem = $this->find('first', array( 'conditions' => array('id' => $itemId)));
             if (empty($findItem))
                 continue;
             $findItem = $findItem['Item'];
@@ -70,6 +71,7 @@ public function getReductionWithReductionalItems($item, $user_id)
             if (empty($findHistory))
                     continue;
             $reduction += $findItem['price'];
+            break;
         }
         return $reduction;
     }
diff --git a/Model/Section.php b/Model/Section.php
new file mode 100644
index 0000000..2e58f0b
--- /dev/null
+++ b/Model/Section.php
@@ -0,0 +1,3 @@
+<?php
+
+class Section extends ShopAppModel {}
diff --git a/SQL/schema.php b/SQL/schema.php
index 27ce061..9328edd 100755
--- a/SQL/schema.php
+++ b/SQL/schema.php
@@ -15,6 +15,18 @@ public function after($event = array())
     }
 
     public $shop__categories = array(
+        'order' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 20, 'unsigned' => false),
+        'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
+        'name' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
+        'section' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 1, 'unsigned' => false),
+        'section_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => 8, 'unsigned' => false),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => 1)
+        ),
+        'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'InnoDB')
+    );
+
+    public $shop__sections = array(
         'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 20, 'unsigned' => false, 'key' => 'primary'),
         'name' => array('type' => 'string', 'null' => false, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
         'indexes' => array(
diff --git a/View/Categories/admin_add_category.ctp b/View/Categories/admin_add_category.ctp
index b386c75..2b04430 100644
--- a/View/Categories/admin_add_category.ctp
+++ b/View/Categories/admin_add_category.ctp
@@ -1,29 +1,68 @@
 <section class="content">
-  <div class="row">
-    <div class="col-md-12">
-      <div class="box">
-        <div class="box-header with-border">
-          <h3 class="box-title"><?= $Lang->get('SHOP__CATEGORY_ADD') ?></h3>
-        </div>
-        <div class="box-body">
-          <form action="" method="post" data-ajax="false">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title"><?= $Lang->get('SHOP__CATEGORY_ADD') ?></h3>
+                </div>
+                <div class="box-body">
+                    <form action="" method="post" data-ajax="false">
 
-            <div class="ajax-msg"></div>
+                        <div class="ajax-msg"></div>
 
-            <div class="form-group">
-              <label><?= $Lang->get('GLOBAL__NAME') ?></label>
-              <input name="name" class="form-control"type="text">
-            </div>
+                        <div class="form-group">
+                            <label><?= $Lang->get('GLOBAL__NAME') ?></label>
+                            <input name="name" class="form-control" type="text">
+                        </div>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input type="hidden" id="section" name="section"
+                                       value="<?= (!isset($section_id)) ? "0" : "1" ?>">
+                                <input <?= (!isset($section_id)) ? "checked" : "" ?> id="section_checkbox" value="true"
+                                                                                     name="section_checkbox"
+                                                                                     type="checkbox">
+                                <label for="section_checkbox"><?= $Lang->get('SHOP__CATEGORY_ADD_NO') ?></label>
+                            </div>
+                        </div>
+
+                        <script type="text/javascript">
+                            $('#section_checkbox').change(function (e) {
+                                if ($('#section_checkbox').is(':checked')) {
+                                    $('#section_id').slideUp();
+                                    $("#section").attr('value', '0');
+                                } else {
+                                    $('#section_id').slideDown();
+                                    $("#section").attr('value', '1');
+
+                                }
+                            });
+                        </script>
+
+                        <div class="form-group"
+                             id="section_id" <?= (!isset($section_id)) ? "style='display:none'" : "" ?>>
+                            <label><?= $Lang->get('SHOP__SECTION') ?></label>
+                            <p><?= $Lang->get('SHOP__CATEGORY_EDIT_MESSAGE') ?> <a
+                                        href="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'add_section', 'admin' => true)) ?>"><?= $Lang->get('SHOP__SECTIONS') ?></a>
+                            </p>
+                            <select class="form-control" name="section_id">
+                                <?php foreach ($search_sections as $v) { ?>
+                                    <option <?= ($section_id == $v['Section']['id']) ? "selected" : "" ?>
+                                            value="<?= $v['Section']['id'] ?>"><?= $v['Section']['name'] ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
 
-            <input type="hidden" name="data[_Token][key]" value="<?= $csrfToken ?>">
+                        <input type="hidden" name="data[_Token][key]" value="<?= $csrfToken ?>">
 
-            <div class="pull-right">
-              <a href="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'index', 'admin' => true)) ?>" class="btn btn-default"><?= $Lang->get('GLOBAL__CANCEL') ?></a>
-              <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
+                        <div class="pull-right">
+                            <a href="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'index', 'admin' => true)) ?>"
+                               class="btn btn-default"><?= $Lang->get('GLOBAL__CANCEL') ?></a>
+                            <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
+                        </div>
+                    </form>
+                </div>
             </div>
-          </form>
         </div>
-      </div>
     </div>
-  </div>
 </section>
diff --git a/View/Categories/admin_add_section.ctp b/View/Categories/admin_add_section.ctp
new file mode 100644
index 0000000..a65667b
--- /dev/null
+++ b/View/Categories/admin_add_section.ctp
@@ -0,0 +1,30 @@
+<section class="content">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title"><?= $Lang->get('SHOP__SECTION_ADD') ?></h3>
+                </div>
+                <div class="box-body">
+                    <form action="" method="post" data-ajax="false">
+
+                        <div class="ajax-msg"></div>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('GLOBAL__NAME') ?></label>
+                            <input name="name" class="form-control" type="text">
+                        </div>
+
+                        <input type="hidden" name="data[_Token][key]" value="<?= $csrfToken ?>">
+
+                        <div class="pull-right">
+                            <a href="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'index', 'admin' => true)) ?>"
+                               class="btn btn-default"><?= $Lang->get('GLOBAL__CANCEL') ?></a>
+                            <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/View/Categories/admin_edit.ctp b/View/Categories/admin_edit.ctp
new file mode 100644
index 0000000..a952294
--- /dev/null
+++ b/View/Categories/admin_edit.ctp
@@ -0,0 +1,68 @@
+<section class="content">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title"><?= $Lang->get('SHOP__CATEGORY_EDIT') ?></h3>
+                </div>
+                <div class="box-body">
+                    <form action="" method="post" data-ajax="false">
+
+                        <div class="ajax-msg"></div>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('GLOBAL__NAME') ?></label>
+                            <input name="name" value="<?= $category['Category']['name'] ?>" class="form-control"
+                                   type="text">
+                        </div>
+
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input type="hidden" id="section" name="section"
+                                       value="<?= $category['Category']['section'] ?>">
+                                <input id="section_checkbox" value="true" name="section_checkbox"
+                                       type="checkbox" <?= $category['Category']['section'] == '0' ? 'checked' : '' ?>>
+                                <label for="section_checkbox"><?= $Lang->get('SHOP__CATEGORY_ADD_NO') ?></label>
+                            </div>
+                        </div>
+
+                        <script type="text/javascript">
+                            $('#section_checkbox').change(function (e) {
+                                if ($('#section_checkbox').is(':checked')) {
+                                    $('#section_id').slideUp();
+                                    $("#section").attr('value', '0');
+                                } else {
+                                    $('#section_id').slideDown();
+                                    $("#section").attr('value', '1');
+
+                                }
+                            });
+                        </script>
+
+                        <div class="form-group" id="section_id"
+                             style="display:<?= ($category['Category']['section'] == 0) ? 'none' : '' ?>">
+                            <label><?= $Lang->get('SHOP__SECTION') ?></label>
+                            <p><?= $Lang->get('SHOP__CATEGORY_EDIT_MESSAGE') ?> <a
+                                        href="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'add_section', 'admin' => true)) ?>"><?= $Lang->get('SHOP__SECTIONS') ?></a>
+                            </p>
+                            <select class="form-control" name="section_id">
+                                <?php foreach ($search_sections as $v) { ?>
+                                    <option value="<?= $v['Section']['id'] ?>" <?= ($category['Category']['section_id'] == $v['Section']['id']) ? 'selected' : '' ?>><?= $v['Section']['name'] ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+
+                        <input type="hidden" name="data[_Token][key]" value="<?= $csrfToken ?>">
+
+                        <div class="pull-right">
+                            <a href="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'index', 'admin' => true)) ?>"
+                               class="btn btn-default"><?= $Lang->get('GLOBAL__CANCEL') ?></a>
+                            <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/View/Categories/admin_index.ctp b/View/Categories/admin_index.ctp
index 0d95c96..2f9afa0 100644
--- a/View/Categories/admin_index.ctp
+++ b/View/Categories/admin_index.ctp
@@ -1,40 +1,173 @@
 <section class="content">
     <div class="row">
+        <div class="col-md-6">
+            <div class="callout callout-info"><h4><?= $Lang->get('SHOP__CATEGORIES') ?></h4><?= $Lang->get('SHOP__CATEGORIES_TIP') ?></div>
+        </div>
+        <div class="col-md-6">
+            <div class="callout callout-warning"><h4><?= $Lang->get('SHOP__SECTION') ?></h4><?= $Lang->get('SHOP__SECTION_TIP') ?></div>
+        </div>
         <div class="col-md-12">
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title"><?= $Lang->get('SHOP__CATEGORIES') ?> &nbsp;&nbsp;<a href="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'add_category', 'admin' => true)) ?>" class="btn btn-success"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
+                    <h3 class="box-title"><?= $Lang->get('SHOP__SECTION_AND_CATEGORIES') ?></h3>
                 </div>
                 <div class="box-body">
                     <table class="table table-bordered">
                         <thead>
-                            <tr>
-                                <th><?= $Lang->get('GLOBAL__NAME') ?></th>
-                                <th><?= $Lang->get('SHOP__CATEGORY_NUMBER') ?></th>
-                                <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
-                            </tr>
+                        <tr>
+                            <th><?= $Lang->get('SHOP__SECTIONS') ?> <a style="display: inline;" href="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'add_section', 'admin' => true)) ?>" class="btn btn-sm btn-success"><?= $Lang->get('GLOBAL__ADD') ?></a></th>
+                            <th><?= $Lang->get('SHOP__CATEGORIES') ?></th>
+                            <th><?= $Lang->get('SHOP__CATEGORY_NUMBER') ?></th>
+                            <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
+                        </tr>
                         </thead>
-                        <tbody>
-                            <?php if(!empty($search_categories)) foreach ($search_categories as $value => $v) {?>
-                            <tr>
+                        <tbody id="sortable">
+                        <?php if(!empty($search_sections)) foreach ($search_sections as $value => $va) {?>
+                            <tr class="item fixed">
                                 <th>
-                                <form action="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'edit_category')) ?>" data-redirect-url="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'index', 'admin' => true)) ?>" method="post" data-ajax="true">
-                                    <input class="form-control transparent-input" name="name" type="text" value="<?=  $v["Category"]["name"] ?>">
-                                    <input type="hidden" name="id" value="<?= $v["Category"]["id"] ?>">
+                                    <form action="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'edit_section')) ?>" data-redirect-url="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'index', 'admin' => true)) ?>" method="post" data-ajax="true">
+                                        <input class="form-control transparent-input" name="name" autocomplete="off" type="text" value="<?=  $va["Section"]["name"] ?>">
+                                        <input type="hidden" name="id" value="<?= $va["Section"]["id"] ?>">
                                 </th>
-                                <th><?= $categories_count[$v['Category']['id']] ?></th>
+                                <th><a href="<?php if(!empty($search_sections)) echo $this->Html->url(array('controller' => 'categories', 'action' => 'add_category/'.$va["Section"]["id"], 'admin' => true)); ?>" class="btn btn-success <?php if(empty($search_sections)) { echo ' disabled'; } ?>"><?= $Lang->get('GLOBAL__ADD') ?></a></th>
+                                <th></th>
                                 <th class="right">
                                     <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
-                                    <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/category/'.$v["Category"]["id"], 'admin' => true)) ?>')" class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+                                    <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/section/'.$va["Section"]["id"], 'admin' => true)) ?>')" class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
                                     </form>
-                                </th>		
+                                </th>
                             </tr>
-                            <?php } ?>
+                            <?php $a=0; if(!empty($search_categories)) foreach ($search_categories[$va["Section"]["id"]] as $value => $v) { $a++;?>
+                                <tr class="item" style="cursor:move;" id="<?= $v["Category"]["id"] ?>-<?= $a ?>">
+                                    <td></td>
+                                    <td>
+                                        <?=  $v["Category"]["name"] ?>
+                                    </td>
+                                    <td><?= $categories_count[$v['Category']['id']] ?></td>
+                                    <td class="right">
+                                        <a href="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'edit/'.$v["Category"]["id"], 'admin' => true)) ?>" class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
+                                        <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/category/'.$v["Category"]["id"], 'admin' => true)) ?>')" class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+                                    </td>
+                                </tr>
+                            <?php }} ?>
+                        </tbody>
+                    </table>
+                    <br>
+                    <div class="ajax-msg"></div>
+                    <button id="save" class="btn btn-success pull-right active" disabled="disabled"><?= $Lang->get('SHOP__SAVE_SUCCESS') ?></button>
+                </div>
+            </div>
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title"><?= $Lang->get('SHOP__CATEGORIES_NO') ?></h3>
+                </div>
+                <div class="box-body">
+                    <table class="table table-bordered">
+                        <thead>
+                        <tr>
+                            <th><?= $Lang->get('SHOP__CATEGORIES') ?> <a style="display: inline;" href="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'add_category', 'admin' => true)); ?>" class="btn btn-sm btn-success "><?= $Lang->get('GLOBAL__ADD') ?></a></th>
+                            <th><?= $Lang->get('SHOP__CATEGORY_NUMBER') ?></th>
+                            <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
+                        </tr>
+                        </thead>
+                        <tbody id="sortable-2">
+                        <?php $i=0; if(!empty($search_categories_no)) foreach ($search_categories_no as $value => $v) { $i++;?>
+                            <tr class="item" style="cursor:move;" id="<?= $v["Category"]["id"] ?>-<?= $i ?>">
+                                <td>
+                                    <?=  $v["Category"]["name"] ?>
+                                </td>
+                                <td><?= $categories_count[$v['Category']['id']] ?></td>
+                                <td class="right">
+                                    <a href="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'edit/'.$v["Category"]["id"], 'admin' => true)) ?>" class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
+                                    <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/category/'.$v["Category"]["id"], 'admin' => true)) ?>')" class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+                                </td>
+                            </tr>
+                        <?php } ?>
+                        </tbody>
+                    </table>
+                    <br>
+                    <div class="ajax-msg"></div>
+                    <button id="save-2" class="btn btn-success pull-right active" disabled="disabled"><?= $Lang->get('SHOP__SAVE_SUCCESS') ?></button>
+                </div>
+            </div>
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title"><?= $Lang->get('SHOP__CATEGORIES_OTHER') ?></h3>
+                </div>
+                <div class="box-body">
+                    <table class="table table-bordered">
+                        <thead>
+                        <tr>
+                            <th><?= $Lang->get('SHOP__CATEGORIES') ?></th>
+                            <th><?= $Lang->get('SHOP__CATEGORY_NUMBER') ?></th>
+                            <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <?php  if(!empty($search_categories_other)) foreach ($search_categories_other as $value => $v) { ?>
+                            <tr>
+                                <td>
+                                    <?=  $v[0]["Category"]["name"] ?>
+                                </td>
+                                <td><?= $categories_count_other[$v[0]['Category']['id']] ?></td>
+                                <td class="right">
+                                    <a href="<?= $this->Html->url(array('controller' => 'categories', 'action' => 'edit/'.$v[0]["Category"]["id"], 'admin' => true)) ?>" class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
+                                    <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/category/'.$v[0]["Category"]["id"], 'admin' => true)) ?>')" class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+                                </td>
+                            </tr>
+                        <?php } ?>
                         </tbody>
                     </table>
                 </div>
             </div>
-        </div>
         </div>
     </div>
-</section>
\ No newline at end of file
+</section>
+<script>
+    $(function() {
+        $( "#sortable" ).sortable({
+            axis: 'y',
+            items: '.item:not(.fixed)',
+            stop: function (event, ui) {
+                $('#save').empty().html('<?= $Lang->get('SHOP__SAVE_IN_PROGRESS') ?>');
+                var inputs = {};
+                var shop_item_order = $(this).sortable('serialize');
+                inputs['shop_item_order'] = shop_item_order;
+                $('#shop_item_order').text(shop_item_order);
+                inputs['data[_Token][key]'] = '<?= $csrfToken ?>';
+                $.post("<?= $this->Html->url(array('controller' => 'categories', 'action' => 'save_ajax', 'admin' => true)) ?>", inputs, function(data) {
+                    if(data.statut) {
+                        $('#save').empty().html('<?= $Lang->get('SHOP__SAVE_SUCCESS') ?>');
+                    } else if(!data.statut) {
+                        $('.ajax-msg').empty().html('<div class="alert alert-danger" style="margin-top:10px;margin-right:10px;margin-left:10px;"><a class="close" data-dismiss="alert">×</a><i class="icon icon-warning-sign"></i> <b><?= $Lang->get('GLOBAL__ERROR') ?> :</b> '+data.msg+'</i></div>').fadeIn(500);
+                    } else {
+                        $('.ajax-msg').empty().html('<div class="alert alert-danger" style="margin-top:10px;margin-right:10px;margin-left:10px;"><a class="close" data-dismiss="alert">×</a><i class="icon icon-warning-sign"></i> <b><?= $Lang->get('GLOBAL__ERROR') ?> :</b> <?= $Lang->get('ERROR__INTERNAL_ERROR') ?></i></div>');
+                    }
+                });
+            }
+        });
+    });
+    $(function() {
+        $( "#sortable-2" ).sortable({
+            axis: 'y',
+            items: '.item:not(.fixed)',
+            stop: function (event, ui) {
+                $('#save-2').empty().html('<?= $Lang->get('SHOP__SAVE_IN_PROGRESS') ?>');
+                var inputs = {};
+                var shop_item_order = $(this).sortable('serialize');
+                inputs['shop_item_order'] = shop_item_order;
+                $('#shop_item_order').text(shop_item_order);
+                inputs['data[_Token][key]'] = '<?= $csrfToken ?>';
+                $.post("<?= $this->Html->url(array('controller' => 'categories', 'action' => 'save_ajax', 'admin' => true)) ?>", inputs, function(data) {
+                    if(data.statut) {
+                        $('#save-2').empty().html('<?= $Lang->get('SHOP__SAVE_SUCCESS') ?>');
+                    } else if(!data.statut) {
+                        $('.ajax-msg').empty().html('<div class="alert alert-danger" style="margin-top:10px;margin-right:10px;margin-left:10px;"><a class="close" data-dismiss="alert">×</a><i class="icon icon-warning-sign"></i> <b><?= $Lang->get('GLOBAL__ERROR') ?> :</b> '+data.msg+'</i></div>').fadeIn(500);
+                    } else {
+                        $('.ajax-msg').empty().html('<div class="alert alert-danger" style="margin-top:10px;margin-right:10px;margin-left:10px;"><a class="close" data-dismiss="alert">×</a><i class="icon icon-warning-sign"></i> <b><?= $Lang->get('GLOBAL__ERROR') ?> :</b> <?= $Lang->get('ERROR__INTERNAL_ERROR') ?></i></div>');
+                    }
+                });
+            }
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/View/Shop/admin_add_item.ctp b/View/Shop/admin_add_item.ctp
index 2f70612..a7145ca 100755
--- a/View/Shop/admin_add_item.ctp
+++ b/View/Shop/admin_add_item.ctp
@@ -1,318 +1,331 @@
 <section class="content">
-  <div class="row">
-    <div class="col-md-12">
-      <div class="box">
-        <div class="box-header with-border">
-          <h3 class="box-title"><?= $Lang->get('SHOP__ITEM_ADD') ?></h3>
-        </div>
-        <div class="box-body">
-          <form action="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'add_item_ajax')) ?>" method="post" data-ajax="true" data-redirect-url="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'index', 'admin' => true)) ?>">
-
-            <div class="ajax-msg"></div>
-
-            <div class="form-group">
-              <label><?= $Lang->get('GLOBAL__NAME') ?></label>
-              <input name="name" class="form-control"type="text">
-            </div>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__ITEM_DESCRIPTION') ?></label>
-              <textarea id="editor" name="description" class="form-control"></textarea>
-              <?= $this->Html->script('admin/tinymce/tinymce.min.js') ?>
-              <script type="text/javascript">
-              tinymce.init({
-                  selector: "textarea",
-                  height : 300,
-                  width : '100%',
-                  language : 'fr_FR',
-                  plugins: "textcolor code image link",
-                  toolbar: "fontselect fontsizeselect bold italic underline strikethrough link image forecolor backcolor alignleft aligncenter alignright alignjustify cut copy paste bullist numlist outdent indent blockquote code"
-               });
-              </script>
-            </div>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__CATEGORY') ?></label>
-              <select class="form-control" name="category">
-                <?php foreach ($categories as $key => $value) { ?>
-                    <option value="<?= $key ?>"><?= $value ?></option>
-                <?php } ?>
-              </select>
-            </div>
-            <input type="hidden" name="category_default">
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__ITEM_PRICE') ?></label>
-              <input name="price" class="form-control" type="text">
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="multiple_buy" type="checkbox">
-                <label><?= $Lang->get('SHOP__ITEM_MULTIPLE_BUY') ?></label>
-              </div>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="cart" type="checkbox">
-                <label><?= $Lang->get('SHOP__ITEM_CART') ?></label>
-              </div>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__ITEM_IMG_URL') ?></label>
-              <input name="img_url" class="form-control" type="text">
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SERVER__TITLE') ?></label>
-              <select class="form-control" name="servers" multiple>
-                <?php foreach ($servers as $key => $value) { ?>
-                    <option value="<?= $key ?>"><?= $value ?></option>
-                <?php } ?>
-              </select>
-            </div>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="display_server" type="checkbox">
-                <label><?= $Lang->get('SHOP__ITEM_DISPLAY_SERVER') ?></label>
-              </div>
-            </div>
-
-            <div class="form-group">
-              <label><?= $Lang->get('GLOBAL__SERVER_COMMANDS') ?></label>
-              <div class="input-group">
-                <input name="commands[0]" class="form-control" type="text">
-                <div class="input-group-btn">
-                  <button data-i="1" type="button" id="addCommand" class="btn btn-success"><?= $Lang->get('SHOP__ITEM_ADD_COMMAND') ?></button>
-                </div>
-              </div>
-              <div class="addCommand"></div>
-              <small><b>{PLAYER}</b> = Pseudo <br><b><?= $Lang->get('GLOBAL__EXAMPLE') ?>:</b> <i>give {PLAYER} 1 1</i></small>
-            </div>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="broadcast_global" type="checkbox">
-                <label><?= $Lang->get('SHOP__ITEM_BROADCAST_GLOBAL') ?></label>
-              </div>
-            </div>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="need_connect" type="checkbox">
-                <label><?= $Lang->get('SHOP__ITEM_CHECKBOX_CONNECT') ?></label>
-              </div>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="give_skin" type="checkbox">
-                <label><?= $Lang->get('SHOP__ITEM_GIVE_SKIN') ?></label>
-              </div>
-            </div>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="give_cape" type="checkbox">
-                <label><?= $Lang->get('SHOP__ITEM_GIVE_CAPE') ?></label>
-              </div>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__ITEM_TIMED_COMMAND') ?></label>
-              <div class="radio">
-                <input name="timedCommand" type="radio" value="true">
-                <label>
-                  <?= $Lang->get('GLOBAL__ENABLED') ?>
-                </label>
-              </div>
-              <div class="radio">
-                <input name="timedCommand" type="radio" value="false" checked>
-                <label>
-                  <?= $Lang->get('GLOBAL__DISABLED') ?>
-                </label>
-              </div>
-              <small><i><?= $Lang->get('SHOP__ITEM_TIMED_COMMAND_DESC') ?></i></small>
-            </div>
-            <div id="timedCommands" style="display:none;">
-              <div class="form-group">
-                <label><?= $Lang->get('GLOBAL__SERVER_COMMANDS') ?></label>
-                <input type="text" name="timedCommand_cmd" class="form-control">
-                <small><b>{PLAYER}</b> = Pseudo <br> <b>[{+}]</b> <?= $Lang->get('SERVER__PARSE_NEW_COMMAND') ?> <br><b><?= $Lang->get('GLOBAL__EXAMPLE') ?>:</b> <i>give {PLAYER} 1 1[{+}]broadcast {PLAYER} ...</i></small>
-              </div>
-              <div class="form-group">
-                <label><?= $Lang->get('SHOP__ITEM_TIMED_COMMAND_TIME') ?></label>
-                  <input type="text" name="timedCommand_time" placeholder="Minutes" class="form-control">
-              </div>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="display" type="checkbox" checked="checked">
-                <label><?= $Lang->get('SHOP__ITEM_CHECKBOX_DISPLAY') ?></label>
-              </div>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__ITEM_PREREQUISITES') ?></label>
-              <select class="form-control" name="prerequisites_type">
-                <option value="0"><?= $Lang->get('SHOP__ITEM_PREREQUISITES_TYPE_0') ?></option>
-                <option value="1"><?= $Lang->get('SHOP__ITEM_PREREQUISITES_TYPE_1') ?></option>
-                <option value="2"><?= $Lang->get('SHOP__ITEM_PREREQUISITES_TYPE_2') ?></option>
-              </select>
-            </div>
-
-            <script type="text/javascript">
-              $('select[name="prerequisites_type"]').on('change', function(e) {
-                if($(this).val() == '1' || $(this).val() == '2') {
-                  $('#prerequisites').slideDown();
-                } else {
-                  $('#prerequisites').slideUp();
-                }
-              });
-            </script>
-
-            <div class="form-group" style="display:none;" id="prerequisites">
-              <label><?= $Lang->get('SHOP__ITEM_PREREQUISITES_ITEMS') ?></label>
-              <select class="form-control" name="prerequisites" multiple>
-                <?php foreach ($items_available as $key => $value) { ?>
-                    <option value="<?= $key ?>"><?= $value ?></option>
-                <?php } ?>
-              </select>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="reductional_items_checkbox" id="reductional_items_checkbox" type="checkbox">
-                <label><?= $Lang->get('SHOP__ITEM_CHECKBOX_REDUCTIONAL_ITEMS') ?></label>
-              </div>
-            </div>
-
-            <script type="text/javascript">
-              $('#reductional_items_checkbox').on('change', function(e) {
-                if($('#reductional_items_checkbox:checked').length > 0) {
-                  $('#reductional_items').slideDown();
-                } else {
-                  $('#reductional_items').slideUp();
-                }
-              });
-            </script>
-
-            <div class="form-group" style="display:none;" id="reductional_items">
-              <label><?= $Lang->get('SHOP__ITEM_PREREQUISITES_ITEMS') ?></label>
-              <select class="form-control" name="reductional_items" multiple>
-                <?php foreach ($items_available as $key => $value) { ?>
-                    <option value="<?= $key ?>"><?= $value ?></option>
-                <?php } ?>
-              </select>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__ITEM_BUY_LIMIT') ?></label>
-              <input name="buy_limit" class="form-control" type="text" value="0" placeholder="<?= $Lang->get('SHOP__ITEM_BUY_LIMIT_PLACEHOLDER') ?>">
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__ITEM_WAIT_TIME') ?></label>
-              <div class="row">
-                <div class="col-md-6">
-                  <input name="wait_time[time]" class="form-control" type="text" value="0">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title"><?= $Lang->get('SHOP__ITEM_ADD') ?></h3>
                 </div>
-                <div class="col-md-6">
-                  <select class="form-control" name="wait_time[type]">
-                    <option value="seconds"><?= $Lang->get('GLOBAL__DATE_SECONDS') ?></option>
-                    <option value="hours"><?= $Lang->get('GLOBAL__DATE_HOURS') ?></option>
-                    <option value="days"><?= $Lang->get('GLOBAL__DATE_DAYS') ?></option>
-                    <option value="months"><?= $Lang->get('GLOBAL__DATE_MONTH') ?></option>
-                    <option value="years"><?= $Lang->get('GLOBAL__DATE_YEARS') ?></option>
-                  </select>
+                <div class="box-body">
+                    <form action="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'add_item_ajax')) ?>"
+                          method="post" data-ajax="true"
+                          data-redirect-url="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'index', 'admin' => true)) ?>">
+
+                        <div class="ajax-msg"></div>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('GLOBAL__NAME') ?></label>
+                            <input name="name" class="form-control" type="text">
+                        </div>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__ITEM_DESCRIPTION') ?></label>
+                            <textarea id="editor" name="description" class="form-control"></textarea>
+                            <?= $this->Html->script('admin/tinymce/tinymce.min.js') ?>
+                            <script type="text/javascript">
+                                tinymce.init({
+                                    selector: "textarea",
+                                    height: 300,
+                                    width: '100%',
+                                    language: 'fr_FR',
+                                    plugins: "textcolor code image link hr preview fullscreen ",
+                                    toolbar: "fontselect fontsizeselect fullscreen preview bold italic underline strikethrough link image forecolor backcolor alignleft aligncenter alignright alignjustify cut copy paste bullist numlist outdent indent blockquote hr code"
+                                });
+                            </script>
+                        </div>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__CATEGORY') ?></label>
+                            <select class="form-control" name="category">
+                                <?php foreach ($search_categories as $v) { ?>
+                                    <option <?= ($category_id == $v['Category']['id']) ? "selected" : "" ?>
+                                            value="<?= $v['Category']['id'] ?>">
+                                        [<?= $section[$v['Category']['section_id']]['Section']['name'] ?>]
+                                        - <?= $v['Category']['name'] ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                        <input type="hidden" name="category_default">
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__ITEM_PRICE') ?></label>
+                            <input name="price" class="form-control" type="text">
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="multiple_buy" type="checkbox">
+                                <label><?= $Lang->get('SHOP__ITEM_MULTIPLE_BUY') ?></label>
+                            </div>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="cart" type="checkbox">
+                                <label><?= $Lang->get('SHOP__ITEM_CART') ?></label>
+                            </div>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__ITEM_IMG_URL') ?></label>
+                            <input name="img_url" class="form-control" type="text">
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SERVER__TITLE') ?></label>
+                            <select class="form-control" name="servers" multiple>
+                                <?php foreach ($servers as $key => $value) { ?>
+                                    <option value="<?= $key ?>"><?= $value ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="display_server" type="checkbox">
+                                <label><?= $Lang->get('SHOP__ITEM_DISPLAY_SERVER') ?></label>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('GLOBAL__SERVER_COMMANDS') ?></label>
+                            <div class="input-group">
+                                <input name="commands[0]" class="form-control" type="text">
+                                <div class="input-group-btn">
+                                    <button data-i="1" type="button" id="addCommand"
+                                            class="btn btn-success"><?= $Lang->get('SHOP__ITEM_ADD_COMMAND') ?></button>
+                                </div>
+                            </div>
+                            <div class="addCommand"></div>
+                            <small><b>{PLAYER}</b> = Pseudo <br><b><?= $Lang->get('GLOBAL__EXAMPLE') ?>:</b> <i>give
+                                    {PLAYER} 1 1</i></small>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="broadcast_global" type="checkbox">
+                                <label><?= $Lang->get('SHOP__ITEM_BROADCAST_GLOBAL') ?></label>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="need_connect" type="checkbox">
+                                <label><?= $Lang->get('SHOP__ITEM_CHECKBOX_CONNECT') ?></label>
+                            </div>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="give_skin" type="checkbox">
+                                <label><?= $Lang->get('SHOP__ITEM_GIVE_SKIN') ?></label>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="give_cape" type="checkbox">
+                                <label><?= $Lang->get('SHOP__ITEM_GIVE_CAPE') ?></label>
+                            </div>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__ITEM_TIMED_COMMAND') ?></label>
+                            <div class="radio">
+                                <input name="timedCommand" type="radio" value="true">
+                                <label>
+                                    <?= $Lang->get('GLOBAL__ENABLED') ?>
+                                </label>
+                            </div>
+                            <div class="radio">
+                                <input name="timedCommand" type="radio" value="false" checked>
+                                <label>
+                                    <?= $Lang->get('GLOBAL__DISABLED') ?>
+                                </label>
+                            </div>
+                            <small><i><?= $Lang->get('SHOP__ITEM_TIMED_COMMAND_DESC') ?></i></small>
+                        </div>
+                        <div id="timedCommands" style="display:none;">
+                            <div class="form-group">
+                                <label><?= $Lang->get('GLOBAL__SERVER_COMMANDS') ?></label>
+                                <input type="text" name="timedCommand_cmd" class="form-control">
+                                <small><b>{PLAYER}</b> = Pseudo <br>
+                                    <b>[{+}]</b> <?= $Lang->get('SERVER__PARSE_NEW_COMMAND') ?>
+                                    <br><b><?= $Lang->get('GLOBAL__EXAMPLE') ?>:</b> <i>give {PLAYER} 1 1[{+}]broadcast
+                                        {PLAYER} ...</i></small>
+                            </div>
+                            <div class="form-group">
+                                <label><?= $Lang->get('SHOP__ITEM_TIMED_COMMAND_TIME') ?></label>
+                                <input type="text" name="timedCommand_time" placeholder="Minutes" class="form-control">
+                            </div>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="display" type="checkbox" checked="checked">
+                                <label><?= $Lang->get('SHOP__ITEM_CHECKBOX_DISPLAY') ?></label>
+                            </div>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__ITEM_PREREQUISITES') ?></label>
+                            <select class="form-control" name="prerequisites_type">
+                                <option value="0"><?= $Lang->get('SHOP__ITEM_PREREQUISITES_TYPE_0') ?></option>
+                                <option value="1"><?= $Lang->get('SHOP__ITEM_PREREQUISITES_TYPE_1') ?></option>
+                                <option value="2"><?= $Lang->get('SHOP__ITEM_PREREQUISITES_TYPE_2') ?></option>
+                            </select>
+                        </div>
+
+                        <script type="text/javascript">
+                            $('select[name="prerequisites_type"]').on('change', function (e) {
+                                if ($(this).val() == '1' || $(this).val() == '2') {
+                                    $('#prerequisites').slideDown();
+                                } else {
+                                    $('#prerequisites').slideUp();
+                                }
+                            });
+                        </script>
+
+                        <div class="form-group" style="display:none;" id="prerequisites">
+                            <label><?= $Lang->get('SHOP__ITEM_PREREQUISITES_ITEMS') ?></label>
+                            <select class="form-control" name="prerequisites" multiple>
+                                <?php foreach ($items_available as $key => $value) { ?>
+                                    <option value="<?= $key ?>"><?= $value ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="reductional_items_checkbox" id="reductional_items_checkbox"
+                                       type="checkbox">
+                                <label><?= $Lang->get('SHOP__ITEM_CHECKBOX_REDUCTIONAL_ITEMS') ?></label>
+                            </div>
+                        </div>
+
+                        <script type="text/javascript">
+                            $('#reductional_items_checkbox').on('change', function (e) {
+                                if ($('#reductional_items_checkbox:checked').length > 0) {
+                                    $('#reductional_items').slideDown();
+                                } else {
+                                    $('#reductional_items').slideUp();
+                                }
+                            });
+                        </script>
+
+                        <div class="form-group" style="display:none;" id="reductional_items">
+                            <label><?= $Lang->get('SHOP__ITEM_PREREQUISITES_ITEMS') ?></label>
+                            <select class="form-control" name="reductional_items" multiple>
+                                <?php foreach ($items_available as $key => $value) { ?>
+                                    <option value="<?= $key ?>"><?= $value ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__ITEM_BUY_LIMIT') ?></label>
+                            <input name="buy_limit" class="form-control" type="text" value="0"
+                                   placeholder="<?= $Lang->get('SHOP__ITEM_BUY_LIMIT_PLACEHOLDER') ?>">
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__ITEM_WAIT_TIME') ?></label>
+                            <div class="row">
+                                <div class="col-md-6">
+                                    <input name="wait_time[time]" class="form-control" type="text" value="0">
+                                </div>
+                                <div class="col-md-6">
+                                    <select class="form-control" name="wait_time[type]">
+                                        <option value="seconds"><?= $Lang->get('GLOBAL__DATE_SECONDS') ?></option>
+                                        <option value="hours"><?= $Lang->get('GLOBAL__DATE_HOURS') ?></option>
+                                        <option value="days"><?= $Lang->get('GLOBAL__DATE_DAYS') ?></option>
+                                        <option value="months"><?= $Lang->get('GLOBAL__DATE_MONTH') ?></option>
+                                        <option value="years"><?= $Lang->get('GLOBAL__DATE_YEARS') ?></option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="pull-right">
+                            <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'index', 'admin' => true)) ?>"
+                               class="btn btn-default"><?= $Lang->get('GLOBAL__CANCEL') ?></a>
+                            <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
+                        </div>
+                    </form>
                 </div>
-              </div>
-            </div>
-
-            <div class="pull-right">
-              <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'index', 'admin' => true)) ?>" class="btn btn-default"><?= $Lang->get('GLOBAL__CANCEL') ?></a>
-              <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
             </div>
-          </form>
         </div>
-      </div>
     </div>
-  </div>
 </section>
 <script>
-  $('input[type="radio"][name="timedCommand"]').change(function(e) {
-    if($('input[type="radio"][name="timedCommand"]').serialize() == "timedCommand=true") {
-      $('#timedCommands').slideDown(500);
-    } else {
-      $('#timedCommands').slideUp(500);
-    }
-  });
+    $('input[type="radio"][name="timedCommand"]').change(function (e) {
+        if ($('input[type="radio"][name="timedCommand"]').serialize() == "timedCommand=true") {
+            $('#timedCommands').slideDown(500);
+        } else {
+            $('#timedCommands').slideUp(500);
+        }
+    });
 
-  $('#addCommand').on('click', function(e) {
+    $('#addCommand').on('click', function (e) {
 
-    e.preventDefault();
+        e.preventDefault();
 
-    var i = parseInt($(this).attr('data-i'));
+        var i = parseInt($(this).attr('data-i'));
 
-    var input = '';
-    input += '<div style="margin-top:5px;" class="input-group" id="'+i+'">';
-      input += '<input name="commands['+i+']" class="form-control" type="text">';
-      input += '<span class="input-group-btn">';
-        input += '<button class="btn btn-danger delete-cmd" data-id="'+i+'" type="button"><span class="fa fa-close"></span></button>';
-      input += '</span>';
-    input + '</div>';
+        var input = '';
+        input += '<div style="margin-top:5px;" class="input-group" id="' + i + '">';
+        input += '<input name="commands[' + i + ']" class="form-control" type="text">';
+        input += '<span class="input-group-btn">';
+        input += '<button class="btn btn-danger delete-cmd" data-id="' + i + '" type="button"><span class="fa fa-close"></span></button>';
+        input += '</span>';
+        input + '</div>';
 
-    i++;
+        i++;
 
-    $(this).attr('data-i', i);
+        $(this).attr('data-i', i);
 
-    $('.addCommand').append(input);
+        $('.addCommand').append(input);
 
-    $('.delete-cmd').unbind('click');
-    $('.delete-cmd').on('click', function(e) {
+        $('.delete-cmd').unbind('click');
+        $('.delete-cmd').on('click', function (e) {
 
-      var id = $(this).attr('data-id');
+            var id = $(this).attr('data-id');
 
-      $('#'+id).slideUp(150, function() {
-        $('#'+id).remove();
-      });
-    });
+            $('#' + id).slideUp(150, function () {
+                $('#' + id).remove();
+            });
+        });
 
-  });
+    });
 
-  $('.delete-cmd').on('click', function(e) {
+    $('.delete-cmd').on('click', function (e) {
 
-    var id = $(this).attr('data-id');
+        var id = $(this).attr('data-id');
 
-    $('#'+id).slideUp(150, function() {
-      $('#'+id).remove();
+        $('#' + id).slideUp(150, function () {
+            $('#' + id).remove();
+        });
     });
-  });
 
 </script>
diff --git a/View/Shop/admin_edit.ctp b/View/Shop/admin_edit.ctp
index 3af1dd5..dba1c4b 100755
--- a/View/Shop/admin_edit.ctp
+++ b/View/Shop/admin_edit.ctp
@@ -1,334 +1,369 @@
 <section class="content">
-  <div class="row">
-    <div class="col-md-12">
-      <div class="box">
-        <div class="box-header with-border">
-          <h3 class="box-title"><?= $Lang->get('SHOP__ITEM_EDIT') ?></h3>
-        </div>
-        <div class="box-body">
-          <form action="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'edit_ajax')) ?>" method="post" data-ajax="true" data-redirect-url="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'index', 'admin' => true)) ?>">
-
-            <div class="ajax-msg"></div>
-
-            <input type="hidden" name="id" value="<?= $item['id'] ?>">
-
-            <div class="form-group">
-              <label><?= $Lang->get('GLOBAL__NAME') ?></label>
-              <input name="name" class="form-control" value="<?= $item['name'] ?>" type="text">
-            </div>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__ITEM_DESCRIPTION') ?></label>
-              <textarea id="editor" name="description" class="form-control"><?= $item['description'] ?></textarea>
-              <?= $this->Html->script('admin/tinymce/tinymce.min.js') ?>
-              <script type="text/javascript">
-              tinymce.init({
-                  selector: "textarea",
-                  height : 300,
-                  width : '100%',
-                  language : 'fr_FR',
-                  plugins: "textcolor code image link",
-                  toolbar: "fontselect fontsizeselect bold italic underline strikethrough link image forecolor backcolor alignleft aligncenter alignright alignjustify cut copy paste bullist numlist outdent indent blockquote code"
-               });
-              </script>
-            </div>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__CATEGORY') ?></label>
-              <select class="form-control" name="category">
-                <option value="" selected><?= $item['category'] ?></option>
-                <?php foreach ($categories as $key => $value) { ?>
-                    <option value="<?= $key ?>"><?= $value ?></option>
-                <?php } ?>
-              </select>
-            </div>
-            <input type="hidden" name="category_default" value="<?= $item['category'] ?>">
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__ITEM_PRICE') ?></label>
-              <input name="price" class="form-control" value="<?= $item['price'] ?>" type="text">
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="multiple_buy" type="checkbox"<?= (isset($item['multiple_buy']) && $item['multiple_buy']) ? ' checked=""' : '' ?>>
-                <label><?= $Lang->get('SHOP__ITEM_MULTIPLE_BUY') ?></label>
-              </div>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="cart" type="checkbox"<?= (isset($item['cart']) && $item['cart']) ? ' checked=""' : '' ?>>
-                <label><?= $Lang->get('SHOP__ITEM_CART') ?></label>
-              </div>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__ITEM_IMG_URL') ?></label>
-              <input name="img_url" class="form-control" value="<?= $item['img_url'] ?>" type="text">
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SERVER__TITLE') ?></label>
-              <select class="form-control" name="servers" multiple>
-                <?php foreach ($servers as $key => $value) { ?>
-                    <option value="<?= $key ?>"<?= (isset($selected_server) && in_array($key, $selected_server)) ? ' selected' : '' ?>><?= $value ?></option>
-                <?php } ?>
-              </select>
-            </div>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="display_server" type="checkbox"<?= (isset($item['display_server']) && $item['display_server']) ? ' checked=""' : '' ?>>
-                <label><?= $Lang->get('SHOP__ITEM_DISPLAY_SERVER') ?></label>
-              </div>
-            </div>
-
-            <div class="form-group">
-              <label><?= $Lang->get('GLOBAL__SERVER_COMMANDS') ?></label>
-              <div class="input-group">
-                <input name="commands[0]" class="form-control" value="<?= htmlentities($item['commands'][0]) ?>" type="text">
-                <div class="input-group-btn">
-                  <button data-i="<?= count($item['commands']) ?>" type="button" id="addCommand" class="btn btn-success"><?= $Lang->get('SHOP__ITEM_ADD_COMMAND') ?></button>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title"><?= $Lang->get('SHOP__ITEM_EDIT') ?></h3>
                 </div>
-              </div>
-              <div class="addCommand">
-                <?php
-                  $i = 0;
-                  unset($item['commands'][0]);
-                  foreach ($item['commands'] as $key => $value) {
-                    $i++;
-                    echo '<div class="input-group" style="margin-top:5px;" id="'.$i.'">';
-                      echo '<input name="commands['.$i.']" class="form-control" value="'.htmlentities($value).'" type="text">';
-                      echo '<span class="input-group-btn">';
-                        echo '<button class="btn btn-danger delete-cmd" data-id="'.$i.'" type="button"><span class="fa fa-close"></span></button>';
-                      echo '</span>';
-                    echo '</div>';
-                  }
-                ?>
-              </div>
-              <small><b>{PLAYER}</b> = Pseudo <br> <b>[{+}]</b> <?= $Lang->get('SERVER__PARSE_NEW_COMMAND') ?> <br><b><?= $Lang->get('GLOBAL__EXAMPLE') ?>:</b> <i>give {PLAYER} 1 1[{+}]broadcast {PLAYER} ...</i></small>
-            </div>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="broadcast_global" type="checkbox"<?= (!isset($item['broadcast_global']) || $item['broadcast_global']) ? ' checked=""' : '' ?>>
-                <label><?= $Lang->get('SHOP__ITEM_BROADCAST_GLOBAL') ?></label>
-              </div>
-            </div>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="need_connect" type="checkbox"<?= (isset($item['need_connect']) && $item['need_connect']) ? ' checked=""' : '' ?>>
-                <label><?= $Lang->get('SHOP__ITEM_CHECKBOX_CONNECT') ?></label>
-              </div>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="give_skin" type="checkbox"<?= (isset($item['give_skin']) && $item['give_skin']) ? ' checked=""' : '' ?>>
-                <label><?= $Lang->get('SHOP__ITEM_GIVE_SKIN') ?></label>
-              </div>
-            </div>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="give_cape" type="checkbox"<?= (isset($item['give_cape']) && $item['give_cape']) ? ' checked=""' : '' ?>>
-                <label><?= $Lang->get('SHOP__ITEM_GIVE_CAPE') ?></label>
-              </div>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__ITEM_TIMED_COMMAND') ?></label>
-              <div class="radio">
-                <input name="timedCommand" type="radio" value="true"<?= ($item['timedCommand']) ? ' checked=""' : ''; ?>>
-                <label>
-                  <?= $Lang->get('GLOBAL__ENABLED') ?>
-                </label>
-              </div>
-              <div class="radio">
-                <input name="timedCommand" type="radio" value="false"<?= (!$item['timedCommand']) ? ' checked=""' : ''; ?>>
-                <label>
-                  <?= $Lang->get('GLOBAL__DISABLED') ?>
-                </label>
-              </div>
-              <small><i><?= $Lang->get('SHOP__ITEM_TIMED_COMMAND_DESC') ?></i></small>
-            </div>
-            <div id="timedCommands" style="display:<?= ($item['timedCommand']) ? 'block' : 'none' ?>;">
-              <div class="form-group">
-                <label><?= $Lang->get('GLOBAL__SERVER_COMMANDS') ?></label>
-                <input type="text" name="timedCommand_cmd" value="<?= (isset($item['timedCommand_cmd'])) ? htmlentities($item['timedCommand_cmd']) : '' ?>" class="form-control">
-                <small><b>{PLAYER}</b> = Pseudo <br> <b>[{+}]</b> <?= $Lang->get('SERVER__PARSE_NEW_COMMAND') ?> <br><b><?= $Lang->get('GLOBAL__EXAMPLE') ?>:</b> <i>give {PLAYER} 1 1[{+}]broadcast {PLAYER} ...</i></small>
-              </div>
-              <div class="form-group">
-                <label><?= $Lang->get('SHOP__ITEM_TIMED_COMMAND_TIME') ?></label>
-                  <input type="text" name="timedCommand_time" placeholder="Minutes" value="<?= @$item['timedCommand_time'] ?>" class="form-control">
-              </div>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input name="display" type="checkbox"<?= ((isset($item['display']) && $item['display'])) ? ' checked=""' : '' ?>>
-                <label><?= $Lang->get('SHOP__ITEM_CHECKBOX_DISPLAY') ?></label>
-              </div>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__ITEM_PREREQUISITES') ?></label>
-              <select class="form-control" name="prerequisites_type">
-                <option value="0"<?= (!isset($item['prerequisites_type']) || empty($item['prerequisites_type']) || $item['prerequisites_type'] == 0) ? ' selected' : '' ?>><?= $Lang->get('SHOP__ITEM_PREREQUISITES_TYPE_0') ?></option>
-                <option value="1"<?= ($item['prerequisites_type'] == 1) ? ' selected' : '' ?>><?= $Lang->get('SHOP__ITEM_PREREQUISITES_TYPE_1') ?></option>
-                <option value="2"<?= ($item['prerequisites_type'] == 2) ? ' selected' : '' ?>><?= $Lang->get('SHOP__ITEM_PREREQUISITES_TYPE_2') ?></option>
-              </select>
-            </div>
-
-            <script type="text/javascript">
-              $('select[name="prerequisites_type"]').on('change', function(e) {
-                if($(this).val() == '1' || $(this).val() == '2') {
-                  $('#prerequisites').slideDown();
-                } else {
-                  $('#prerequisites').slideUp();
-                }
-              });
-            </script>
-
-            <div class="form-group" style="display:<?= ($item['prerequisites_type'] == '2' || $item['prerequisites_type'] == '1') ? 'block' : 'none' ?>;" id="prerequisites">
-              <label><?= $Lang->get('SHOP__ITEM_PREREQUISITES_ITEMS') ?></label>
-              <select class="form-control" name="prerequisites" multiple>
-                <?php foreach ($items_available as $id => $name) { ?>
-                    <option value="<?= $id ?>"<?= (in_array($id, $item['prerequisites'])) ? ' selected' : '' ?>><?= $name ?></option>
-                <?php } ?>
-              </select>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <div class="checkbox">
-                <input id="reductional_items_checkbox" name="reductional_items_checkbox" type="checkbox"<?= ((isset($item['reductional_items']) && !empty($item['reductional_items']))) ? ' checked=""' : '' ?>>
-                <label><?= $Lang->get('SHOP__ITEM_CHECKBOX_REDUCTIONAL_ITEMS') ?></label>
-              </div>
-            </div>
-
-            <script type="text/javascript">
-              $('#reductional_items_checkbox').on('change', function(e) {
-                if($('#reductional_items_checkbox:checked').length > 0) {
-                  $('#reductional_items').slideDown();
-                } else {
-                  $('#reductional_items').slideUp();
-                }
-              });
-            </script>
-
-            <div class="form-group" style="display:<?= (isset($item['reductional_items']) && !empty($item['reductional_items'])) ? 'block' : 'none' ?>;" id="reductional_items">
-              <label><?= $Lang->get('SHOP__ITEM_PREREQUISITES_ITEMS') ?></label>
-              <select class="form-control" name="reductional_items" multiple>
-                <?php foreach ($items_available as $id => $name) { ?>
-                    <option value="<?= $id ?>"<?= (in_array($id, $item['reductional_items'])) ? ' selected' : '' ?>><?= $name ?></option>
-                <?php } ?>
-              </select>
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__ITEM_BUY_LIMIT') ?></label>
-              <input name="buy_limit" class="form-control" type="text" value="<?= (!isset($item['buy_limit']) || empty($item['buy_limit'])) ? '0' : $item['buy_limit'] ?>" placeholder="<?= $Lang->get('SHOP__ITEM_BUY_LIMIT_PLACEHOLDER') ?>">
-            </div>
-
-            <hr>
-
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__ITEM_WAIT_TIME') ?></label>
-              <div class="row">
-                <div class="col-md-6">
-                  <input name="wait_time[time]" class="form-control" type="text" value="<?= (!isset($item['wait_time']['time']) || empty($item['wait_time']['time'])) ? '0' : $item['wait_time']['time'] ?>">
-                </div>
-                <div class="col-md-6">
-                  <select class="form-control" name="wait_time[type]">
-                    <option value="seconds"<?= ((!isset($item['wait_time']['type']) || empty($item['wait_time']['type'])) || (isset($item['wait_time']['type']) && $item['wait_time']['type'] == "seconds")) ? ' selected' : '' ?>><?= $Lang->get('GLOBAL__DATE_SECONDS') ?></option>
-                    <option value="hours"<?= (isset($item['wait_time']['type']) && $item['wait_time']['type'] == "hours") ? ' selected' : '' ?>><?= $Lang->get('GLOBAL__DATE_HOURS') ?></option>
-                    <option value="days"<?= (isset($item['wait_time']['type']) && $item['wait_time']['type'] == "days") ? ' selected' : '' ?>><?= $Lang->get('GLOBAL__DATE_DAYS') ?></option>
-                    <option value="months"<?= (isset($item['wait_time']['type']) && $item['wait_time']['type'] == "months") ? ' selected' : '' ?>><?= $Lang->get('GLOBAL__DATE_MONTH') ?></option>
-                    <option value="years"<?= (isset($item['wait_time']['type']) && $item['wait_time']['type'] == "years") ? ' selected' : '' ?>><?= $Lang->get('GLOBAL__DATE_YEARS') ?></option>
-                  </select>
+                <div class="box-body">
+                    <form action="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'edit_ajax')) ?>"
+                          method="post" data-ajax="true"
+                          data-redirect-url="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'index', 'admin' => true)) ?>">
+
+                        <div class="ajax-msg"></div>
+
+                        <input type="hidden" name="id" value="<?= $item['id'] ?>">
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('GLOBAL__NAME') ?></label>
+                            <input name="name" class="form-control" value="<?= $item['name'] ?>" type="text">
+                        </div>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__ITEM_DESCRIPTION') ?></label>
+                            <textarea id="editor" name="description"
+                                      class="form-control"><?= $item['description'] ?></textarea>
+                            <?= $this->Html->script('admin/tinymce/tinymce.min.js') ?>
+
+                            <script type="text/javascript">
+                                tinymce.init({
+                                    selector: "textarea",
+                                    height : 300,
+                                    width : '100%',
+                                    language : 'fr_FR',
+                                    plugins: "textcolor code image link",
+                                    toolbar: "fontselect fontsizeselect bold italic underline strikethrough link image forecolor backcolor alignleft aligncenter alignright alignjustify cut copy paste bullist numlist outdent indent blockquote code"
+                                });
+                            </script>
+                        </div>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__CATEGORY') ?></label>
+                            <select class="form-control" name="category">
+                                <?php foreach ($search_categories as $v) { ?>
+                                    <option value="<?= $v['Category']['id'] ?>" <?= ($item['category'] == $v['Category']['id']) ? 'selected' : '' ?>>
+                                        [<?= $section[$v['Category']['section_id']]['Section']['name'] ?>]
+                                        - <?= $v['Category']['name'] ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+                        <input type="hidden" name="category_default" value="<?= $item['category'] ?>">
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__ITEM_PRICE') ?></label>
+                            <input name="price" class="form-control" value="<?= $item['price'] ?>" type="text">
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="multiple_buy"
+                                       type="checkbox"<?= (isset($item['multiple_buy']) && $item['multiple_buy']) ? ' checked=""' : '' ?>>
+                                <label><?= $Lang->get('SHOP__ITEM_MULTIPLE_BUY') ?></label>
+                            </div>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="cart"
+                                       type="checkbox"<?= (isset($item['cart']) && $item['cart']) ? ' checked=""' : '' ?>>
+                                <label><?= $Lang->get('SHOP__ITEM_CART') ?></label>
+                            </div>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__ITEM_IMG_URL') ?></label>
+                            <input name="img_url" class="form-control" value="<?= $item['img_url'] ?>" type="text">
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SERVER__TITLE') ?></label>
+                            <select class="form-control" name="servers" multiple>
+                                <?php foreach ($servers as $key => $value) { ?>
+                                    <option value="<?= $key ?>"<?= (isset($selected_server) && in_array($key, $selected_server)) ? ' selected' : '' ?>><?= $value ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="display_server"
+                                       type="checkbox"<?= (isset($item['display_server']) && $item['display_server']) ? ' checked=""' : '' ?>>
+                                <label><?= $Lang->get('SHOP__ITEM_DISPLAY_SERVER') ?></label>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('GLOBAL__SERVER_COMMANDS') ?></label>
+                            <div class="input-group">
+                                <input name="commands[0]" class="form-control"
+                                       value="<?= htmlentities($item['commands'][0]) ?>" type="text">
+                                <div class="input-group-btn">
+                                    <button data-i="<?= count($item['commands']) ?>" type="button" id="addCommand"
+                                            class="btn btn-success"><?= $Lang->get('SHOP__ITEM_ADD_COMMAND') ?></button>
+                                </div>
+                            </div>
+                            <div class="addCommand">
+                                <?php
+                                $i = 0;
+                                unset($item['commands'][0]);
+                                foreach ($item['commands'] as $key => $value) {
+                                    $i++;
+                                    echo '<div class="input-group" style="margin-top:5px;" id="' . $i . '">';
+                                    echo '<input name="commands[' . $i . ']" class="form-control" value="' . htmlentities($value) . '" type="text">';
+                                    echo '<span class="input-group-btn">';
+                                    echo '<button class="btn btn-danger delete-cmd" data-id="' . $i . '" type="button"><span class="fa fa-close"></span></button>';
+                                    echo '</span>';
+                                    echo '</div>';
+                                }
+                                ?>
+                            </div>
+                            <small><b>{PLAYER}</b> = Pseudo <br>
+                                <b>[{+}]</b> <?= $Lang->get('SERVER__PARSE_NEW_COMMAND') ?>
+                                <br><b><?= $Lang->get('GLOBAL__EXAMPLE') ?>:</b> <i>give {PLAYER} 1 1[{+}]broadcast
+                                    {PLAYER} ...</i></small>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="broadcast_global"
+                                       type="checkbox"<?= (!isset($item['broadcast_global']) || $item['broadcast_global']) ? ' checked=""' : '' ?>>
+                                <label><?= $Lang->get('SHOP__ITEM_BROADCAST_GLOBAL') ?></label>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="need_connect"
+                                       type="checkbox"<?= (isset($item['need_connect']) && $item['need_connect']) ? ' checked=""' : '' ?>>
+                                <label><?= $Lang->get('SHOP__ITEM_CHECKBOX_CONNECT') ?></label>
+                            </div>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="give_skin"
+                                       type="checkbox"<?= (isset($item['give_skin']) && $item['give_skin']) ? ' checked=""' : '' ?>>
+                                <label><?= $Lang->get('SHOP__ITEM_GIVE_SKIN') ?></label>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="give_cape"
+                                       type="checkbox"<?= (isset($item['give_cape']) && $item['give_cape']) ? ' checked=""' : '' ?>>
+                                <label><?= $Lang->get('SHOP__ITEM_GIVE_CAPE') ?></label>
+                            </div>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__ITEM_TIMED_COMMAND') ?></label>
+                            <div class="radio">
+                                <input name="timedCommand" type="radio"
+                                       value="true"<?= ($item['timedCommand']) ? ' checked=""' : ''; ?>>
+                                <label>
+                                    <?= $Lang->get('GLOBAL__ENABLED') ?>
+                                </label>
+                            </div>
+                            <div class="radio">
+                                <input name="timedCommand" type="radio"
+                                       value="false"<?= (!$item['timedCommand']) ? ' checked=""' : ''; ?>>
+                                <label>
+                                    <?= $Lang->get('GLOBAL__DISABLED') ?>
+                                </label>
+                            </div>
+                            <small><i><?= $Lang->get('SHOP__ITEM_TIMED_COMMAND_DESC') ?></i></small>
+                        </div>
+                        <div id="timedCommands" style="display:<?= ($item['timedCommand']) ? 'block' : 'none' ?>;">
+                            <div class="form-group">
+                                <label><?= $Lang->get('GLOBAL__SERVER_COMMANDS') ?></label>
+                                <input type="text" name="timedCommand_cmd"
+                                       value="<?= (isset($item['timedCommand_cmd'])) ? htmlentities($item['timedCommand_cmd']) : '' ?>"
+                                       class="form-control">
+                                <small><b>{PLAYER}</b> = Pseudo <br>
+                                    <b>[{+}]</b> <?= $Lang->get('SERVER__PARSE_NEW_COMMAND') ?>
+                                    <br><b><?= $Lang->get('GLOBAL__EXAMPLE') ?>:</b> <i>give {PLAYER} 1 1[{+}]broadcast
+                                        {PLAYER} ...</i></small>
+                            </div>
+                            <div class="form-group">
+                                <label><?= $Lang->get('SHOP__ITEM_TIMED_COMMAND_TIME') ?></label>
+                                <input type="text" name="timedCommand_time" placeholder="Minutes"
+                                       value="<?= @$item['timedCommand_time'] ?>" class="form-control">
+                            </div>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input name="display"
+                                       type="checkbox"<?= ((isset($item['display']) && $item['display'])) ? ' checked=""' : '' ?>>
+                                <label><?= $Lang->get('SHOP__ITEM_CHECKBOX_DISPLAY') ?></label>
+                            </div>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__ITEM_PREREQUISITES') ?></label>
+                            <select class="form-control" name="prerequisites_type">
+                                <option value="0"<?= (!isset($item['prerequisites_type']) || empty($item['prerequisites_type']) || $item['prerequisites_type'] == 0) ? ' selected' : '' ?>><?= $Lang->get('SHOP__ITEM_PREREQUISITES_TYPE_0') ?></option>
+                                <option value="1"<?= ($item['prerequisites_type'] == 1) ? ' selected' : '' ?>><?= $Lang->get('SHOP__ITEM_PREREQUISITES_TYPE_1') ?></option>
+                                <option value="2"<?= ($item['prerequisites_type'] == 2) ? ' selected' : '' ?>><?= $Lang->get('SHOP__ITEM_PREREQUISITES_TYPE_2') ?></option>
+                            </select>
+                        </div>
+
+                        <script type="text/javascript">
+                            $('select[name="prerequisites_type"]').on('change', function (e) {
+                                if ($(this).val() == '1' || $(this).val() == '2') {
+                                    $('#prerequisites').slideDown();
+                                } else {
+                                    $('#prerequisites').slideUp();
+                                }
+                            });
+                        </script>
+
+                        <div class="form-group"
+                             style="display:<?= ($item['prerequisites_type'] == '2' || $item['prerequisites_type'] == '1') ? 'block' : 'none' ?>;"
+                             id="prerequisites">
+                            <label><?= $Lang->get('SHOP__ITEM_PREREQUISITES_ITEMS') ?></label>
+                            <select class="form-control" name="prerequisites" multiple>
+                                <?php foreach ($items_available as $id => $name) { ?>
+                                    <option value="<?= $id ?>"<?= (in_array($id, $item['prerequisites'])) ? ' selected' : '' ?>><?= $name ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <input id="reductional_items_checkbox" name="reductional_items_checkbox"
+                                       type="checkbox"<?= ((isset($item['reductional_items']) && !empty($item['reductional_items']))) ? ' checked=""' : '' ?>>
+                                <label><?= $Lang->get('SHOP__ITEM_CHECKBOX_REDUCTIONAL_ITEMS') ?></label>
+                            </div>
+                        </div>
+
+                        <script type="text/javascript">
+                            $('#reductional_items_checkbox').on('change', function (e) {
+                                if ($('#reductional_items_checkbox:checked').length > 0) {
+                                    $('#reductional_items').slideDown();
+                                } else {
+                                    $('#reductional_items').slideUp();
+                                }
+                            });
+                        </script>
+
+                        <div class="form-group"
+                             style="display:<?= (isset($item['reductional_items']) && !empty($item['reductional_items'])) ? 'block' : 'none' ?>;"
+                             id="reductional_items">
+                            <label><?= $Lang->get('SHOP__ITEM_PREREQUISITES_ITEMS') ?></label>
+                            <select class="form-control" name="reductional_items" multiple>
+                                <?php foreach ($items_available as $id => $name) { ?>
+                                    <option value="<?= $id ?>"<?= (in_array($id, $item['reductional_items'])) ? ' selected' : '' ?>><?= $name ?></option>
+                                <?php } ?>
+                            </select>
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__ITEM_BUY_LIMIT') ?></label>
+                            <input name="buy_limit" class="form-control" type="text"
+                                   value="<?= (!isset($item['buy_limit']) || empty($item['buy_limit'])) ? '0' : $item['buy_limit'] ?>"
+                                   placeholder="<?= $Lang->get('SHOP__ITEM_BUY_LIMIT_PLACEHOLDER') ?>">
+                        </div>
+
+                        <hr>
+
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__ITEM_WAIT_TIME') ?></label>
+                            <div class="row">
+                                <div class="col-md-6">
+                                    <input name="wait_time[time]" class="form-control" type="text"
+                                           value="<?= (!isset($item['wait_time']['time']) || empty($item['wait_time']['time'])) ? '0' : $item['wait_time']['time'] ?>">
+                                </div>
+                                <div class="col-md-6">
+                                    <select class="form-control" name="wait_time[type]">
+                                        <option value="seconds"<?= ((!isset($item['wait_time']['type']) || empty($item['wait_time']['type'])) || (isset($item['wait_time']['type']) && $item['wait_time']['type'] == "seconds")) ? ' selected' : '' ?>><?= $Lang->get('GLOBAL__DATE_SECONDS') ?></option>
+                                        <option value="hours"<?= (isset($item['wait_time']['type']) && $item['wait_time']['type'] == "hours") ? ' selected' : '' ?>><?= $Lang->get('GLOBAL__DATE_HOURS') ?></option>
+                                        <option value="days"<?= (isset($item['wait_time']['type']) && $item['wait_time']['type'] == "days") ? ' selected' : '' ?>><?= $Lang->get('GLOBAL__DATE_DAYS') ?></option>
+                                        <option value="months"<?= (isset($item['wait_time']['type']) && $item['wait_time']['type'] == "months") ? ' selected' : '' ?>><?= $Lang->get('GLOBAL__DATE_MONTH') ?></option>
+                                        <option value="years"<?= (isset($item['wait_time']['type']) && $item['wait_time']['type'] == "years") ? ' selected' : '' ?>><?= $Lang->get('GLOBAL__DATE_YEARS') ?></option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="pull-right">
+                            <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'index', 'admin' => true)) ?>"
+                               class="btn btn-default"><?= $Lang->get('GLOBAL__CANCEL') ?></a>
+                            <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
+                        </div>
+                    </form>
                 </div>
-              </div>
-            </div>
-
-            <div class="pull-right">
-              <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'index', 'admin' => true)) ?>" class="btn btn-default"><?= $Lang->get('GLOBAL__CANCEL') ?></a>
-              <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
             </div>
-          </form>
         </div>
-      </div>
     </div>
-  </div>
 </section>
 <script>
-  $('input[type="radio"][name="timedCommand"]').change(function(e) {
-    if($('input[type="radio"][name="timedCommand"]').serialize() == "timedCommand=true") {
-      $('#timedCommands').slideDown(500);
-    } else {
-      $('#timedCommands').slideUp(500);
-    }
-  });
+    $('input[type="radio"][name="timedCommand"]').change(function (e) {
+        if ($('input[type="radio"][name="timedCommand"]').serialize() == "timedCommand=true") {
+            $('#timedCommands').slideDown(500);
+        } else {
+            $('#timedCommands').slideUp(500);
+        }
+    });
 
-  $('#addCommand').on('click', function(e) {
+    $('#addCommand').on('click', function (e) {
 
-    e.preventDefault();
+        e.preventDefault();
 
-    var i = parseInt($(this).attr('data-i'));
+        var i = parseInt($(this).attr('data-i'));
 
-    var input = '';
-    input += '<div style="margin-top:5px;" class="input-group" id="'+i+'">';
-      input += '<input name="commands['+i+']" class="form-control" type="text">';
-      input += '<span class="input-group-btn">';
-        input += '<button class="btn btn-danger delete-cmd" data-id="'+i+'" type="button"><span class="fa fa-close"></span></button>';
-      input += '</span>';
-    input + '</div>';
+        var input = '';
+        input += '<div style="margin-top:5px;" class="input-group" id="' + i + '">';
+        input += '<input name="commands[' + i + ']" class="form-control" type="text">';
+        input += '<span class="input-group-btn">';
+        input += '<button class="btn btn-danger delete-cmd" data-id="' + i + '" type="button"><span class="fa fa-close"></span></button>';
+        input += '</span>';
+        input + '</div>';
 
-    i++;
+        i++;
 
-    $(this).attr('data-i', i);
+        $(this).attr('data-i', i);
 
-    $('.addCommand').append(input);
+        $('.addCommand').append(input);
 
-    $('.delete-cmd').unbind('click');
-    $('.delete-cmd').on('click', function(e) {
+        $('.delete-cmd').unbind('click');
+        $('.delete-cmd').on('click', function (e) {
 
-      var id = $(this).attr('data-id');
+            var id = $(this).attr('data-id');
 
-      $('#'+id).slideUp(150, function() {
-        $('#'+id).remove();
-      });
-    });
+            $('#' + id).slideUp(150, function () {
+                $('#' + id).remove();
+            });
+        });
 
-  });
+    });
 
-  $('.delete-cmd').on('click', function(e) {
+    $('.delete-cmd').on('click', function (e) {
 
-    var id = $(this).attr('data-id');
+        var id = $(this).attr('data-id');
 
-    $('#'+id).slideUp(150, function() {
-      $('#'+id).remove();
+        $('#' + id).slideUp(150, function () {
+            $('#' + id).remove();
+        });
     });
-  });
 </script>
diff --git a/View/Shop/admin_index.ctp b/View/Shop/admin_index.ctp
index 159f9e6..3fea11f 100755
--- a/View/Shop/admin_index.ctp
+++ b/View/Shop/admin_index.ctp
@@ -1,24 +1,27 @@
 <section class="content">
-  <div class="row">
-    <div class="col-md-6">
-      <div class="box">
-        <div class="box-header with-border">
-          <h3 class="box-title"><?= $Lang->get('SHOP__CONFIG') ?></h3>
-        </div>
-        <div class="box-body">
-          <form action="<?= $this->Html->url(array('action' => 'config_items')) ?>" method="post" data-ajax="true">
+    <div class="row">
+        <div class="col-md-6">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title"><?= $Lang->get('SHOP__CONFIG') ?></h3>
+                </div>
+                <div class="box-body">
+                    <form action="<?= $this->Html->url(array('action' => 'config_items')) ?>" method="post"
+                          data-ajax="true">
 
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__CONFIG_BROADCAST_GLOBAL') ?></label>
-              <input name="broadcast_global" class="form-control" type="text"<?= (isset($config['broadcast_global'])) ? ' value="'.$config['broadcast_global'].'"' : '' ?>>
-            </div>
-            <div class="form-group">
-              <label><?= $Lang->get('SHOP__CONFIG_GOAL_TITLE') ?></label>
-			        <p><?= $Lang->get('SHOP__CONFIG_GOAL_DESC') ?></p>
-              <input name="goal" class="form-control" type="text"<?= (isset($config['goal'])) ? ' value="'.$config['goal'].'"' : '' ?>>
-            </div>
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__CONFIG_BROADCAST_GLOBAL') ?></label>
+                            <input name="broadcast_global" class="form-control"
+                                   type="text"<?= (isset($config['broadcast_global'])) ? ' value="' . $config['broadcast_global'] . '"' : '' ?>>
+                        </div>
+                        <div class="form-group">
+                            <label><?= $Lang->get('SHOP__CONFIG_GOAL_TITLE') ?></label>
+                            <p><?= $Lang->get('SHOP__CONFIG_GOAL_DESC') ?></p>
+                            <input name="goal" class="form-control"
+                                   type="text"<?= (isset($config['goal'])) ? ' value="' . $config['goal'] . '"' : '' ?>>
+                        </div>
 
-            <!--<div class="form-group">
+                        <!--<div class="form-group">
               <div class="checkbox">
                 <input name="disabled-sort_by_server" type="checkbox"<?= (isset($config['sort_by_server']) && $config['sort_by_server']) ? ' checked=""' : '' ?> disabled>
                 <label><?= $Lang->get('SHOP__CONFIG_SORT_BY_SERVER') ?></label>
@@ -26,189 +29,219 @@
               <small><?= $Lang->get('GLOBAL__TEMPORALY_DISABLED') ?></small>
             </div>-->
 
-            <div class="form-group">
-              <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
-            </div>
+                        <div class="form-group">
+                            <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
+                        </div>
 
-          </form>
-        </div>
-      </div>
-    </div>
-    <div class="col-md-6">
-      <div class="box">
-        <div class="box-header">
-          <h3 class="box-title"><?= $Lang->get('SHOP__CONFIG_EXPLAIN_TITLE') ?></h3>
-        </div>
-        <div class="box-body">
-          <blockquote>
-            <p><?= $Lang->get('SHOP__CONFIG_EXPLAIN') ?></p>
-          </blockquote>
-          <p><b><?= $Lang->get('SHOP__CONFIG_VARIABLES') ?> : </b></p>
-          <p><em>{ITEM_NAME}</em> : <?= $Lang->get('SHOP__CONFIG_VARIABLE_ITEM') ?></p>
-          <p><em>{QUANTITY}</em> : <?= $Lang->get('SHOP__CONFIG_VARIABLE_QUANTITY') ?></p>
-          <p><em>{PLAYER}</em> : <?= $Lang->get('SHOP__CONFIG_VARIABLE_PLAYER') ?></p>
-          <p><em>{SERVERNAME}</em> : <?= $Lang->get('SHOP__CONFIG_VARIABLE_SERVERNAME') ?></p>
+                    </form>
+                </div>
+            </div>
         </div>
-      </div>
-    </div>
-  </div>
-    <div class="row">
-      <div class="col-md-12">
-        <div class="box">
-          <div class="box-header with-border">
-            <h3 class="box-title"><?= $Lang->get('SHOP__ITEMS_AVAILABLE') ?> &nbsp;&nbsp;<a href="<?php if(!empty($search_categories)) { ?><?= $this->Html->url(array('controller' => 'shop', 'action' => 'add_item', 'admin' => true)) ?><?php } ?>" class="btn btn-success<?php if(empty($search_categories)) { echo ' disabled'; } ?>"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
-          </div>
-          <div class="box-body">
-
-            <table class="table table-bordered">
-              <thead>
-                <tr>
-                  <th><?= $Lang->get('SHOP__CATEGORY') ?></th>
-                  <th><?= $Lang->get('SHOP__ITEMS_AVAILABLE') ?></th>
-                  <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
-                  <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
-                </tr>
-              </thead>
-              <tbody id="sortable">
-                <?php if(!empty($search_categories)) foreach ($search_categories as $value => $v) {?>
-                  <tr class="item fixed">
-                    <th>
-                        <?= $v["Category"]["name"] ?>
-                    </th>
-                    <th></th>
-                    <th></th>
-                    <th></th>		
-                  </tr>
-                  <?php  $i=0; if(!empty($search_items)) foreach ($search_items as $val => $va) { $i++; 
-                    if ($va['Item']['category'] == $v["Category"]["id"]) {
-                  ?>
-                      <tr class="item" style="cursor:move;" id="<?= $va["Item"]["name"] ?>-<?= $i ?>">
-                        <td></td>
-                        <td><?= $va["Item"]["name"] ?></td>
-                        <td><?= $va["Item"]["price"] ?> <?= $Configuration->getMoneyName() ?></td>
-                        <td class="right">
-                          <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'edit/'.$va["Item"]["id"], 'admin' => true)) ?>" class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
-                          <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/item/'.$va["Item"]["id"], 'admin' => true)) ?>')" class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
-                        </td>
-                      </tr>
-                  <?php }} ?>
-                <?php } ?>
-              </tbody>
-            </table>
-            <br>
-		  <div class="ajax-msg"></div>
-		  <button id="save" class="btn btn-success pull-right active" disabled="disabled"><?= $Lang->get('SHOP__SAVE_SUCCESS') ?></button>
-          </div>
+        <div class="col-md-6">
+            <div class="box">
+                <div class="box-header">
+                    <h3 class="box-title"><?= $Lang->get('SHOP__CONFIG_EXPLAIN_TITLE') ?></h3>
+                </div>
+                <div class="box-body">
+                    <blockquote>
+                        <p><?= $Lang->get('SHOP__CONFIG_EXPLAIN') ?></p>
+                    </blockquote>
+                    <p><b><?= $Lang->get('SHOP__CONFIG_VARIABLES') ?> : </b></p>
+                    <p><em>{ITEM_NAME}</em> : <?= $Lang->get('SHOP__CONFIG_VARIABLE_ITEM') ?></p>
+                    <p><em>{QUANTITY}</em> : <?= $Lang->get('SHOP__CONFIG_VARIABLE_QUANTITY') ?></p>
+                    <p><em>{PLAYER}</em> : <?= $Lang->get('SHOP__CONFIG_VARIABLE_PLAYER') ?></p>
+                    <p><em>{SERVERNAME}</em> : <?= $Lang->get('SHOP__CONFIG_VARIABLE_SERVERNAME') ?></p>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
     <div class="row">
-      <div class="col-md-12">
-        <div class="box">
-          <div class="box-header with-border">
-            <h3 class="box-title"><?= $Lang->get('SHOP__ITEMS_AVAILABLE_OTHER') ?></h3>
-          </div>
-          <div class="box-body">
-
-            <table class="table table-bordered">
-              <thead>
-                <tr>
-                  <th><?= $Lang->get('SHOP__ITEMS_AVAILABLE') ?></th>
-                  <th><?= $Lang->get('SERVER__TITLE') ?></th>
-                  <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
-                  <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
-                </tr>
-              </thead>
-              <tbody>
-                  <?php if(!empty($search_items_other)) foreach ($search_items_other as $val => $va) { 
-                  ?>
-                      <tr>
-                        <td><?= $va["Item"]["name"] ?></td>
-                        <td><?= $item_server[$va['Item']['id']] ?></td>
-                        <td><?= $va["Item"]["price"] ?> <?= $Configuration->getMoneyName() ?></td>
-                        <td class="right">
-                          <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'edit/'.$va["Item"]["id"], 'admin' => true)) ?>" class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
-                          <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/item/'.$va["Item"]["id"], 'admin' => true)) ?>')" class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
-                        </td>
-                      </tr>
-                  <?php } ?>
-              </tbody>
-            </table>
-            <br>
-		  <div class="ajax-msg"></div>
-          </div>
+        <div class="col-md-12">
+            <div class="nav-tabs-custom">
+                <ul class="nav nav-tabs">
+                    <li class="active"><a href="#category_other" data-toggle="tab"
+                                          aria-expanded="true"><?= $Lang->get('SHOP__ITEMS_AVAILABLE_OTHER') ?></a></li>
+                    <?php if (!empty($search_sections)) foreach ($search_sections as $value) { ?>
+                        <li class="dropdown">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#" aria-expanded="false">
+                                <?= $value['Section']['name'] ?> <span class="caret"></span>
+                            </a>
+                            <ul class="dropdown-menu">
+                                <?php if (!empty($search_categories)) foreach ($search_categories["section-id-" . $value['Section']['id']] as $v) { ?>
+                                    <li class=""><a href="#category_<?= $v['Category']['id'] ?>" data-toggle="tab"
+                                                    aria-expanded="false"><?= $v['Category']['name'] ?></a></li>
+                                <?php } ?>
+                            </ul>
+                        </li>
+                    <?php } ?>
+                    <?php if (!empty($search_categories_without_section)) foreach ($search_categories_without_section as $value) {
+                        $i++; ?>
+                        <li><a href="#category_<?= $value['Category']['id'] ?>" data-toggle="tab"
+                               aria-expanded="true"><?= $value['Category']['name'] ?></a></li>
+                    <?php } ?>
+                </ul>
+                <div class="tab-content">
+                    <div class="tab-pane active" id="category_other">
+                        <table class="table table-bordered">
+                            <thead>
+                            <tr>
+                                <th><?= $Lang->get('SHOP__ITEMS_AVAILABLE') ?></th>
+                                <th><?= $Lang->get('SERVER__TITLE') ?></th>
+                                <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
+                                <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <?php if (!empty($search_items_other)) foreach ($search_items_other as $val => $va) { ?>
+                                <tr>
+                                    <td><?= $va["Item"]["name"] ?></td>
+                                    <td><?= $item_server[$va['Item']['id']] ?></td>
+                                    <td><?= $va["Item"]["price"] ?> <?= $Configuration->getMoneyName() ?></td>
+                                    <td class="right">
+                                        <a onClick="confirmDuplicate('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'duplicate/' . $va["Item"]["id"], 'admin' => true)) ?>')"
+                                           class="btn bg-olive"><?= $Lang->get('SHOP__DUPLICATE') ?></a>
+                                        <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'edit/' . $va["Item"]["id"], 'admin' => true)) ?>"
+                                           class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
+                                        <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/item/' . $va["Item"]["id"], 'admin' => true)) ?>')"
+                                           class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+                                    </td>
+                                </tr>
+                            <?php } ?>
+                            </tbody>
+                        </table>
+                    </div>
+                    <?php if (!empty($search_categories)) foreach ($search_categories as $v) { ?>
+                        <div class="tab-pane" id="category_<?= $v['Category']['id'] ?>">
+                            <table class="table table-bordered">
+                                <thead>
+                                <tr>
+                                    <th><?= $Lang->get('SHOP__ITEMS_AVAILABLE') ?>
+                                        &nbsp;&nbsp;
+                                        <a style="display:inline"
+                                           href="<?php if (!empty($search_categories)) { ?><?= $this->Html->url(array('controller' => 'shop', 'action' => 'add_item/' . $v['Category']['id'], 'admin' => true)) ?><?php } ?>"
+                                           class="btn btn-sm btn-success
+                                           <?php if (empty($search_categories)) {
+                                               echo ' disabled';
+                                           } ?>">
+                                            <?= $Lang->get('GLOBAL__ADD') ?>
+                                        </a>
+                                    </th>
+                                    <th><?= $Lang->get('SERVER__TITLE') ?></th>
+                                    <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
+                                    <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
+                                </tr>
+                                </thead>
+                                <tbody id="sortable-<?= $v['Category']['id'] ?>">
+                                <?php $i = 0;
+                                if (!empty($search_items)) foreach ($search_items[$v['Category']['id']] as $va) { ?>
+                                    <tr class="item" style="cursor:move;" id="<?= $va["Item"]["id"] ?>-<?= $i ?>">
+                                        <td><?= $va["Item"]["name"] ?></td>
+                                        <td><?= $item_server[$va['Item']['id']] ?></td>
+                                        <td><?= $va["Item"]["price"] ?> <?= $Configuration->getMoneyName() ?></td>
+                                        <td class="right">
+                                            <a onClick="confirmDuplicate('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'duplicate/' . $va["Item"]["id"], 'admin' => true)) ?>')"
+                                               class="btn bg-olive"><?= $Lang->get('SHOP__DUPLICATE') ?></a>
+                                            <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'edit/' . $va["Item"]["id"], 'admin' => true)) ?>"
+                                               class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
+                                            <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/item/' . $va["Item"]["id"], 'admin' => true)) ?>')"
+                                               class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+                                        </td>
+                                    </tr>
+                                    <?php $i++;
+                                } ?>
+                                </tbody>
+                            </table>
+                            <div class="ajax-msg"></div>
+                            <button id="save" class="btn btn-success pull-right active"
+                                    disabled="disabled"><?= $Lang->get('SHOP__SAVE_SUCCESS') ?></button>
+                            <br><br>
+                        </div>
+                        <script type="text/javascript">
+                            function confirmDuplicate(url) {
+                                if (confirm("<?= $Lang->get('SHOP__CONFIRM_DUPLICATE') ?>"))
+                                    window.location.href = '' + url + '';
+                                else
+                                    return false;
+                            }
+                        </script>
+                    <?php } ?>
+                    <script>
+                        $(function () {
+                            $("<?= implode(', ', array_map(function ($category) {
+                                return "#sortable-" . $category['Category']['id'];
+                            }, $search_categories)); ?>").sortable({
+                                axis: 'y',
+                                items: '.item:not(.fixed)',
+                                stop: function (event, ui) {
+                                    $('#save').empty().html('<?= $Lang->get('SHOP__SAVE_IN_PROGRESS') ?>');
+                                    var inputs = {};
+                                    var shop_item_order = $(this).sortable('serialize');
+                                    inputs['shop_item_order'] = shop_item_order;
+                                    $('#shop_item_order').text(shop_item_order);
+                                    inputs['data[_Token][key]'] = '<?= $csrfToken ?>';
+                                    $.post("<?= $this->Html->url(array('controller' => 'shop', 'action' => 'save_ajax', 'admin' => true)) ?>", inputs, function (data) {
+                                        if (data.statut) {
+                                            $('#save').empty().html('<?= $Lang->get('SHOP__SAVE_SUCCESS') ?>');
+                                        } else if (!data.statut) {
+                                            $('.ajax-msg').empty().html('<div class="alert alert-danger" style="margin-top:10px;margin-right:10px;margin-left:10px;"><a class="close" data-dismiss="alert">×</a><i class="icon icon-warning-sign"></i> <b><?= $Lang->get('GLOBAL__ERROR') ?> :</b> ' + data.msg + '</i></div>').fadeIn(500);
+                                        } else {
+                                            $('.ajax-msg').empty().html('<div class="alert alert-danger" style="margin-top:10px;margin-right:10px;margin-left:10px;"><a class="close" data-dismiss="alert">×</a><i class="icon icon-warning-sign"></i> <b><?= $Lang->get('GLOBAL__ERROR') ?> :</b> <?= $Lang->get('ERROR__INTERNAL_ERROR') ?></i></div>');
+                                        }
+                                    });
+                                }
+                            });
+                        });
+                    </script>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
     <div class="row">
-      <div class="col-md-12">
-        <div class="box">
-          <div class="box-header with-border">
-            <h3 class="box-title"><?= $Lang->get('SHOP__HISTORY_PURCHASES') ?></h3>
-          </div>
-          <div class="box-body">
+        <div class="col-md-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title"><?= $Lang->get('SHOP__HISTORY_PURCHASES') ?></h3>
+                </div>
+                <div class="box-body">
 
-            <table class="table table-bordered dataTable" id="histories_buy">
-              <thead>
-                <tr>
-                  <th><?= $Lang->get('SHOP__ITEM') ?></th>
-                  <th>Pseudo</th>
-                  <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
-                </tr>
-              </thead>
-              <tbody>
-              </tbody>
-            </table>
+                    <table class="table table-bordered dataTable" id="histories_buy">
+                        <thead>
+                        <tr>
+                            <th><?= $Lang->get('SHOP__ITEM') ?></th>
+                            <th>Pseudo</th>
+                            <th>UUID</th>
+                            <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        </tbody>
+                    </table>
 
-          </div>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
+    </div>
 </section>
 <script type="text/javascript">
-$(document).ready(function() {
-  $('#histories_buy').DataTable({
-    "paging": true,
-    "lengthChange": false,
-    "searching": false,
-    "ordering": false,
-    "info": false,
-    "autoWidth": false,
-    'searching': true,
-    "bProcessing": true,
-    "bServerSide": true,
-    "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_histories_buy')) ?>",
-    "aoColumns": [
-        {mData:"Item.name"},
-        {mData:"User.pseudo"},
-        {mData:"ItemsBuyHistory.created"}
-    ],
-  });
-});
-</script>
-<script>
-$(function() {
-  $( "#sortable" ).sortable({
-    axis: 'y',
-    items: '.item:not(.fixed)',
-    stop: function (event, ui) {
-        $('#save').empty().html('<?= $Lang->get('SHOP__SAVE_IN_PROGRESS') ?>');
-        var inputs = {};
-        var shop_item_order = $(this).sortable('serialize');
-        inputs['shop_item_order'] = shop_item_order;
-        $('#shop_item_order').text(shop_item_order);
-        inputs['data[_Token][key]'] = '<?= $csrfToken ?>';
-        $.post("<?= $this->Html->url(array('controller' => 'shop', 'action' => 'save_ajax', 'admin' => true)) ?>", inputs, function(data) {
-          if(data.statut) {
-                $('#save').empty().html('<?= $Lang->get('SHOP__SAVE_SUCCESS') ?>');
-              } else if(!data.statut) {
-                $('.ajax-msg').empty().html('<div class="alert alert-danger" style="margin-top:10px;margin-right:10px;margin-left:10px;"><a class="close" data-dismiss="alert">×</a><i class="icon icon-warning-sign"></i> <b><?= $Lang->get('GLOBAL__ERROR') ?> :</b> '+data.msg+'</i></div>').fadeIn(500);
-            } else {
-            $('.ajax-msg').empty().html('<div class="alert alert-danger" style="margin-top:10px;margin-right:10px;margin-left:10px;"><a class="close" data-dismiss="alert">×</a><i class="icon icon-warning-sign"></i> <b><?= $Lang->get('GLOBAL__ERROR') ?> :</b> <?= $Lang->get('ERROR__INTERNAL_ERROR') ?></i></div>');
-          }
+    $(document).ready(function () {
+        $('#histories_buy').DataTable({
+            "paging": true,
+            "lengthChange": false,
+            "searching": false,
+            "ordering": false,
+            "info": false,
+            "autoWidth": false,
+            'searching': true,
+            "bProcessing": true,
+            "bServerSide": true,
+            "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_histories_buy')) ?>",
+            "aoColumns": [
+                {mData: "Item.name"},
+                {mData: "User.pseudo"},
+                {mData: "User.UUID"},
+                {mData: "ItemsBuyHistory.created"}
+            ],
         });
-      }
-  });
-});
+    });
 </script>
diff --git a/View/Shop/index.ctp b/View/Shop/index.ctp
index bb25949..eca5235 100755
--- a/View/Shop/index.ctp
+++ b/View/Shop/index.ctp
@@ -5,21 +5,29 @@
     <div class="col-md-3">
       <p class="lead"><?= ($isConnected) ? $money: $Lang->get('SHOP__TITLE'); ?></p>
         <div class="list-group">
-            <?php
-            $i = 0;
-            foreach ($search_categories as $k => $v) {
-              $i++;
-            ?>
-                <a href="<?= $this->Html->url(array('controller' => 'c/'.$v['Category']['id'], 'plugin' => 'shop')) ?>" class="list-group-item<?= (isset($category) AND $v['Category']['id'] == $category OR !isset($category) AND $i == 1) ? ' active' : ''; ?>"><?= before_display($v['Category']['name']) ?></a>
-            <?php } ?>
+            <ul class="nav">
+                <?php foreach ($search_sections as $v) { ?>
+                    <li class="dropdown" style="padding-bottom: 0px;padding-top: 0px;">
+                        <a style="padding-left: 15px;" href="#" class="dropdown-toggle list-group-item" data-toggle="dropdown" role="button" aria-expanded="false"><?= before_display($v['Section']['name']) ?> <span class="caret"></span></a>
+                        <ul class="dropdown-menu" role="menu">
+                        <?php foreach ($search_categories_section[$v['Section']['id']] as $va) { ?>
+                            <li><a href="<?= $this->Html->url(array('controller' => 'c/'.$va['Category']['id'], 'plugin' => 'shop')) ?>"><?= before_display($va['Category']['name']) ?></a></li>
+                        <?php } ?>
+                        </ul>
+                    </li>
+                <?php } ?>
+                <?php foreach ($search_categories_without_section as $v) { ?>
+                    <a href="<?= $this->Html->url(array('controller' => 'c/'.$v['Category']['id'], 'plugin' => 'shop')) ?>" class="list-group-item<?= (isset($category) AND $v['Category']['id'] == $category OR !isset($category) AND $i == 1) ? ' active' : ''; ?>"><?= before_display($v['Category']['name']) ?></a>
+                <?php } ?>
+            </ul>
         </div>
         <?php if($isConnected AND $Permissions->can('CREDIT_ACCOUNT')) { ?>
-          <?php if (!empty($vagoal)) {?>
+          <?php if (!empty($goal_money_max)) {?>
             <hr>
             <h4><?= $Lang->get('SHOP__CONFIG_GOAL_TITLE') ?></h4>
             <div class="progress">
-              <div class="progress-bar-info text-center" role="progressbar" style="width:<?= $vawidth ?>%">
-                <b><?= $vawidth ?>%</b>
+              <div class="progress-bar-info text-center" role="progressbar" style="width:<?= $goal_bar_with ?>%">
+                <b><?= $goal_bar_with ?>%</b>
               </div>
             </div>
             <hr>
@@ -39,7 +47,7 @@
           <?php
           $col = 4;
           $i = 0;
-          foreach ($search_items as $k => $v) {
+		foreach ($search_items as $k => $v) {
             if(!isset($category) AND $v['Item']['category'] == $search_first_category OR isset($category) AND $v['Item']['category'] == $category) {
               $i++;
               $newRow = ( ( $i % ( (12 / $col) ) ) == 0);
diff --git a/config.json b/config.json
index 936c837..0d0dce8 100755
--- a/config.json
+++ b/config.json
@@ -1,31 +1,31 @@
 {
 	"name":"Boutique",
 	"admin_menus": {
-		"Boutique": {
+		"SHOP__TITLE": {
 			"icon": "shopping-cart",
 			"index": "3",
 			"menu": {
-                "Gérer les catégories": {
+          "SHOP__MENU_CATEGORIES": {
 					"icon": "list-alt",
 					"permission": "SHOP__ADMIN_MANAGE_CATEGORIES",
 					"route": "/admin/shop/categories"
 				},
-				"Gérer les articles": {
+				"SHOP__MENU_ITEMS": {
 					"icon": "shopping-basket",
 					"permission": "SHOP__ADMIN_MANAGE_ITEMS",
 					"route": "/admin/shop"
 				},
-				"Gérer les promotions": {
+				"SHOP__MENU_VOUCHERS": {
 					"icon": "percent",
 					"permission": "SHOP__ADMIN_MANAGE_VOUCHERS",
 					"route": "/admin/shop/shop/vouchers"
 				},
-				"Gérer les paiements": {
+				"SHOP__MENU_PAYMENTS": {
 					"icon": "credit-card",
 					"permission": "SHOP__ADMIN_MANAGE_PAYMENT",
 					"route": "/admin/shop/payment"
 				},
-				"Cadeaux": {
+				"SHOP__MENU_GIFT": {
 					"icon": "gift",
 					"permission": "SHOP__ADMIN_MANAGE_ITEMS",
 					"route": "/admin/shop/giftall"
@@ -37,7 +37,7 @@
 		"Boutique": "/shop"
 	},
 	"author":"Eywek",
-	"version":"1.2.21",
+	"version":"1.3.0",
 	"useEvents":true,
 	"permissions" : {
 		"available" : ["CREDIT_ACCOUNT", "CAN_BUY", "SHOP__ADMIN_MANAGE_ITEMS", "SHOP__ADMIN_MANAGE_CATEGORIES", "SHOP__ADMIN_MANAGE_VOUCHERS", "SHOP__ADMIN_MANAGE_PAYMENT", "SHOP__ADMIN_GIFTALL"],
@@ -47,6 +47,6 @@
 		}
 	},
 	"requirements" : {
-		"CMS" : "^1.2.0"
+		"CMS" : "^1.9.0"
 	}
 }
diff --git a/lang/en_US.json b/lang/en_US.json
index 8b7ee80..026b79d 100755
--- a/lang/en_US.json
+++ b/lang/en_US.json
@@ -1,270 +1,273 @@
 {
-    "SHOP__TITLE": "Shop",
-		"SHOP__GLOBAL_AMOUNT": "Amount",
-
-		"SHOP__CONFIG": "Configuration",
-	  	"SHOP__SAVE_SUCCESS": "Saved!",
-  		"SHOP__SAVE_IN_PROGRESS": "Automatic backup ...",
-		"SHOP__CONFIG_GOAL_TITLE": "Goal of the month",
-		"SHOP__CONFIG_GOAL_DESC": "Leave empty to remove",
-		"SHOP__CONFIG_SORT_BY_SERVER": "Sort articles and categories by server",
-		"SHOP__CONFIG_BROADCAST_GLOBAL": "Global order made with each purchase",
-		"SHOP__CONFIG_EXPLAIN_TITLE": "Rationale",
-		"SHOP__CONFIG_EXPLAIN": "The global order will be made on all the selected servers of the purchased article, you can disable this global message for an article when it is created or modified.",
-		"SHOP__CONFIG_VARIABLES": "Available variables",
-		"SHOP__CONFIG_VARIABLE_ITEM": "Name of the item purchased",
-		"SHOP__CONFIG_VARIABLE_QUANTITY": "Quantity of the purchased article",
-		"SHOP__CONFIG_VARIABLE_PLAYER": "Player who bought the item",
-		"SHOP__CONFIG_VARIABLE_SERVERNAME": "Name of the server where the item was purchased (Displayed under a comma-separated list if there is more than one)",
-		"SHOP__CONFIG_SAVE_SUCCESS": "The configuration has been saved!",
-
-		"SHOP__ADMIN_MANAGE_ITEMS": "Manage articles",
-		"SHOP__ADMIN_MANAGE_VOUCHERS": "Manage Promotions",
-		"SHOP__ADMIN_MANAGE_PAYMENT": "Manage Payments",
-
-		"SHOP__PAYPAL_RETURN_MSG": "Return to {WEBSITE_NAME} to collect points",
-
-		"SHOP__VOUCHERS_MANAGE": "Manage promotional codes",
-		"SHOP__VOUCHERS_HISTORIES": "History of the uses of promotional codes",
-		"SHOP__VOUCHER_END_DATE": "End date",
-		"SHOP__VOUCHER_START_DATE": "Start date",
-		"SHOP__VOUCHER_START_DATE_EXPLAIN": "If you set a start date other than now, your promotion may be pre-displayed on the store if the 'Displayed' option is checked, but your users will not be able to use it.",
-		"SHOP__VOUCHER_VALUE_LABEL": "Reduction",
-		"SHOP__VOUCHER_VALUE_INPUT": "In {MONEY_NAME} or percent",
-		"SHOP__VOUCHER_DISPLAYED": "Posted",
-		"SHOP__VOUCHER_CHOOSE_TYPE": "Choose the type",
-		"SHOP__VOUCHER_MSG_ONE_CATEGORY": "A promotion is in progress on the category {CATEGORY} with the code: {CODE} (Reduction {REDUCTION}).",
-		"SHOP__VOUCHER_MSG_MANY_CATEGORIES": "A promotion is underway on {CATEGORIES} categories with the code: {CODE} (Reduced {REDUCTION}).",
-		"SHOP__VOUCHER_MSG_ONE_ITEM": "A promotion is in progress on the article {ITEM} with the code: {CODE} (Reduction {REDUCTION}).",
-		"SHOP__VOUCHER_MSG_MANY_ITEMS": "A promotion is running on {ITEMS} items with the code: {CODE} (Reduced {REDUCTION}).",
-		"SHOP__VOUCHER_MSG_ALL": "A promotion is in progress on all the shop with the code: {CODE} (Reduction {REDUCTION}).",
-		"SHOP__VOUCHER_MSG_SOON": "A {REDUCTION} promotion will be available on {START_DATE}!",
-		"SHOP__VOUCHER_ADD": "Add a promotional code",
-		"SHOP__VOUCHER_SELECT": "Effective on",
-		"SHOP__VOUCHER_SELECT_CHOOSE": "Choose an option",
-		"SHOP__VOUCHER_GENERATE": "Generate a code",
-		"SHOP__VOUCHER_SELECT_ITEMS": "Choose an article (s)",
-		"SHOP__VOUCHER_SELECT_CATEGORIES": "Choose a category (s)",
-		"SHOP__VOUCHER_TYPE_PERCENTAGE": "Percentage",
-		"SHOP__VOUCHER_DISPLAY_CHECKBOX": "By ticking this box, the promotion will be displayed on the shop",
-		"SHOP__VOUCHER_ADD_SUCCESS": "The promotion has been added!",
-		"SHOP__VOUCHER_ADD_ERROR_CODE_INVALID": "Your code is invalid! (Can be alphanumeric only, # is allowed, maximum 20 characters)",
-		"SHOP__VOUCHER_DELETE_SUCCESS": "The promotion has been deleted!",
-		"SHOP__VOUCHER_LIMIT": "Limit of use",
-		"SHOP__VOUCHER_LIMIT_SHORT": "Limit",
-		"SHOP__VOUCHER_LIMIT_DESC": "Put 0 for no limit",
-		"SHOP__VOUCHER_LIMIT_TYPE": "Type of limit",
-		"SHOP__VOUCHER_LIMIT_TYPE_USER": "Per user",
-		"SHOP__VOUCHER_LIMIT_TYPE_GLOBAL": "Global",
-		"SHOP__VOUCHER_CODE": "Code",
-		"SHOP__VOUCHER_REDUCTION": "{MONEY_NAME} discount",
-
-		"SHOP__PAYSAFECARD": "PaySafeCard",
-		"SHOP__PAYSAFECARD_CODE": "Code",
-		"SHOP__PAYSAFECARD_VALID_USER": "Who validated?",
-		"SHOP__PAYSAFECARD_HISTORIES": "PaySafeCard transaction history",
-		"SHOP__PAYSAFECARD_ADMIN_TITLE": "List of PaySafeCards Pending",
-		"SHOP__PAYSAFECARD_DISABLE_SUCCESS": "The PaySafeCard have been deactivated!",
-		"SHOP__PAYSAFECARD_ENABLE_SUCCESS": "The PaySafeCard have been deactivated!",
-		"SHOP__PAYSAFECARD_ERROR_ALREADY_TOO_PSC_IN_DB": "You already have 2 PaySafeCard pending",
-		"SHOP__PAYSAFECARD_ERROR_ALREADY_IN_DB": "You already have this PaySafeCard waiting",
-		"SHOP__PAYSAFECARD_VALID_SUCCESS": "The PaySafeCard has been validated!",
-		"SHOP__PAYSAFECARD_INVALID_SUCCESS": "The PaySafeCard has been refused!",
-		"SHOP__PAYSAFECARD_ADD_SUCCESS": "The PaySafeCard has been added! You will receive an answer within 48h",
-		"SHOP__PAYSAFECARD_VALID_CONFIRM": "How many Shop Points do you want to give for this PaySafeCard?",
-		"SHOP__PAYSAFECARD_MESSAGE_VALID": "Your {AMOUNT} PaySafeCard has been validated! You earn {POINTS} {MONEY_NAME}.",
-		"SHOP__PAYSAFECARD_MESSAGE_INVALID": "Your {AMOUNT} PaySafeCard has been declined.",
-		"SHOP__PAYSAFECARD_ACCEPT": "Validate",
-		"SHOP__PAYSAFECARD_REFUSE": "Deny",
-
-		"SHOP__DEDIPASS_PAYMENT": "Pay with dedipass",
-		"SHOP__DEDIPASS_CONFIGURATION": "Dedipass Configuration",
-		"SHOP__DEDIPASS_EDIT_CONFIG_SUCCESS": "The configuration has been successfully edited!",
-		"SHOP__DEDIPASS_TOGGLE_ERROR_NO_CONFIG": "You can not activate Dedipass if you have not set up public key before!",
-		"SHOP__DEDIPASS_TOGGLE_ENABLE_SUCCESS": "You have successfully activated Dédipass as a payment method!",
-		"SHOP__DEDIPASS_TOGGLE_DISABLE_SUCCESS": "You have deactivated Dédipass as a payment method!",
-		"SHOP__DEDIPASS_PUBLICKEY": "Public key (called <i> data-dedipass </ i> in the installation part of Dédipass)",
-		"SHOP__DEDIPASS_HISTORIES": "Dedipass transaction history",
-		"SHOP__DEDIPASS_PAYMENT_ERROR_NOT_CONNECTED": "You were not logged in, please log in and try again (Code previously entered: {CODE}).",
-		"SHOP__DEDIPASS_PAYMENT_ERROR_INVAID_CODE": "The entered code is invalid.",
-		"SHOP__DEDIPASS_PAYMENT_ERROR_EMPTY_CODE": "Please enter a code.",
-		"SHOP__DEDIPASS_PAYMENT_ERROR_EMPTY_RATE": "Please choose an offer",
-		"SHOP__DEDIPASS_PAYMENT_SUCCESS": "The Dedipass transaction went well, you were credited with {MONEY} {MONEY_NAME}.",
-		"SHOP__DEDIPASS_CODE": "Code",
-		"SHOP__DEDIPASS_RATE": "Landing",
-		"SHOP__DEDIPASS_EXPLAIN_CONFIG": "To use Dédipass, you have to register on the <b> Dédipass </ b> website, then add a new service.You must choose <i> virtual currency </ i> and then configure the You will need the following URLs: ",
-		"SHOP__DEDIPASS_EXPLAIN_CONFIG_URL_1": "Installation URL",
-		"SHOP__DEDIPASS_EXPLAIN_CONFIG_URL_2": "Redirect URL",
-
-		"SHOP__USER_POINTS_TRANSFER": "Send money",
-		"SHOP__USER_POINTS_TRANSFER_ADMIN": "Transfer of points",
-		"SHOP__USER_POINTS_TRANSFER_HISTORIES": "{MONEY_NAME} transfer history between players",
-		"SHOP__USER_POINTS_TRANSFER_WHO": "Who?",
-		"SHOP__USER_POINTS_TRANSFER_HOW_MANY": "How much?",
-		"SHOP__USER_POINTS_TRANSFER_ERROR_EMPTY": "You can not send nothing",
-		"SHOP__USER_POINTS_TRANSFER_ERROR_YOURSELF": "You can not transfer credits to yourself",
-		"SHOP__USER_POINTS_TRANSFER_ERROR_DISABLED": "Point transfer is disabled.",
-		"SHOP__USER_POINTS_TRANSFER_ERROR_WAIT": "You have to wait for a while before you can transfer.",
-		"SHOP__USER_POINTS_TRANSFER_SUCCESS": "The money has been sent!",
-		"SHOP__TRANSFER_ENABLE_SUCCESS": "You have activated the transfer of points!",
-		"SHOP__TRANSFER_DISABLE_SUCCESS": "You have deactivated the transfer of points!",
-	
-		"SHOP__GIFTALL": "Make a gift to everyone",
-  		"SHOP__GIFTALL_VALUE": "Number of shop point(s) to be given to all users of the site",
-  		"SHOP__GIFTALL_SUCCESS": "Your gift has been made",
-
-		"SHOP__ITEM": "Article",
-		"SHOP__ITEMS": "Articles",
-		"SHOP__ITEM_ADD_COMMAND": "Add an order",
-		"SHOP__ITEM_EDIT": "Editing an article",
-		"SHOP__ITEMS_AVAILABLE": "Items for sale",
-		"SHOP__ITEM_NAME": "Name",
-		"SHOP__ITEM_IMG_URL": "URL of the image",
-		"SHOP__ITEM_PRICE": "Price",
-		"SHOP__ITEM_QUANTITY": "Quantity",
-		"SHOP__ITEM_TOTAL": "Total",
-		"SHOP__ITEM_DESCRIPTION": "Description",
-		"SHOP__ITEM_EDIT_SUCCESS": "Article successfully modified!",
-		"SHOP__ITEM_DELETE_SUCCESS": "Article Deleted Successfully!",
-		"SHOP__ITEM_ADD_SUCCESS": "Article added successfully!",
-		"SHOP__ITEM_ADD": "Add an article",
-		"SHOP__ITEM_TIMED_COMMAND": "DIFFERENT COMMAND",
-		"SHOP__ITEM_TIMED_COMMAND_DESC": "This is a command that will be done after a certain time (for grades for example)",
-		"SHOP__ITEM_TIMED_COMMAND_TIME": "Time",
-		"SHOP__ITEM_DISPLAY_SERVER": "Show the server (s) where the article will be given.",
-		"SHOP__ITEM_CHECKBOX_CONNECT": "Require the player to be connected to the server to buy the article",
-		"SHOP__ITEM_CHECKBOX_DISPLAY": "Show article on the shop",
-		"SHOP__ITEM_MULTIPLE_BUY": "Allow this item to be purchased multiple times (in one purchase only)",
-		"SHOP__ITEM_CANT_BUY_MULTIPLE": "You can not buy this item (<i> {ITEM_NAME} </ i>) more than once",
-		"SHOP__ITEM_CART": "Allow add to cart of this article",
-		"SHOP__ITEM_CANT_ADDED_TO_CART": "You can not buy item <i> {ITEM_NAME} </ i> with a cart.",
-		"SHOP__ITEM_CANT_BUY_LIMIT": "You can not buy item <i> {ITEM_NAME} </ i> over {LIMIT} times.",
-		"SHOP__ITEM_BROADCAST_GLOBAL": "Make the global order when purchasing this item",
-		"SHOP__ITEM_PREREQUISITES": "Do you want to activate the prerequisites?",
-		"SHOP__ITEM_PREREQUISITES_TYPE_0": "No.",
-		"SHOP__ITEM_PREREQUISITES_TYPE_1": "Yes, the player must have purchased all the following items",
-		"SHOP__ITEM_PREREQUISITES_TYPE_2": "Yes, the player must have purchased at least one of the following items",
-		"SHOP__ITEM_PREREQUISITES_ITEMS": "Available items",
-		"SHOP__ITEM_CHECKBOX_REDUCTIONAL_ITEMS": "Activate price reduction if one or more of the following items are / are purchased",
-		"SHOP__ITEM_REDUCTIONAL_ITEMS_LIST": "A discount is applied to this item ({REDUCTION}) because you have already purchased the following items {ITEMS_LIST}.",
-		"SHOP__ITEM_CANT_BUY_PREREQUISITES_1": "You can not buy this item without purchasing all of the following items: {ITEMS}",
-		"SHOP__ITEM_CANT_BUY_PREREQUISITES_2": "You can not buy this item without purchasing at least one of the following items: {ITEMS}",
-		"SHOP__ITEM_GIVE_SKIN": "Give permission to change skin with the purchase of this article",
-		"SHOP__ITEM_GIVE_CAPE": "Give permission to change cape with the purchase of this article",
-		"SHOP__ITEM_CANT_BUY_NOT_CONNECTED": "You must be logged in to purchase item <b> {ITEM_NAME} </ b>!",
-		"SHOP__ITEM_BUY_LIMIT": "Purchase limit (how much a maximum item can be purchased)",
-		"SHOP__ITEM_BUY_LIMIT_PLACEHOLDER": "Put 0 for no limit",
-		"SHOP__ITEM_WAIT_TIME": "Time interval between purchases",
-		"SHOP__ITEM_CANT_BUY_WAIT_TIME": "You can not buy item <i> {ITEM_NAME} </ i> now! Every purchase must be spaced from {WAIT_TIME}.",
-        "SHOP__ITEMS_AVAILABLE_OTHER":"Items not listed",
-		"SHOP__ITEM_CURRENCY":"Currency (EUR, USD...)",
-		"SHOP__CATEGORIES": "Categories",
-		"SHOP__CATEGORY": "Category",
-		"SHOP__CATEGORY_ADD": "Add a category",
-		"SHOP__CATEGORY_ADD_SUCCESS": "Category added successfully!",
-		"SHOP__CATEGORY_EDIT_SUCCESS": "Category successfully modified!",
-		"SHOP__CATEGORY_DELETE_SUCCESS": "Category Successfully Deleted!",
-        "SHOP__CATEGORY_NUMBER": "Number of articles linked to the category",
-
-		"SHOP__BUY": "Buy",
-		"SHOP__BUY_CART": "See my cart",
-		"SHOP__BUY_CART_EMPTY": "Your cart is empty.",
-		"SHOP__BUY_ADD_TO_CART": "Add to cart",
-		"SHOP__BUY_ADDED_TO_CART": "Added to cart",
-		"SHOP__BUY_ERROR_NO_ENOUGH_MONEY": "You do not have enough money to make this purchase.",
-		"SHOP__BUY_ERROR_NEED_LOGIN": "You must be logged in to make a purchase.",
-		"SHOP__BUY_ERROR_EMPTY": "You can not buy anything.",
-		"SHOP__BUY_ERROR_NO_CONNECTED": "You must be logged in to make this purchase.",
-		"SHOP__BUY_CONFIRM": "Do you really want to buy this item?",
-		"SHOP__BUY_SUCCESS": "The purchase has just been made",
-		"SHOP__BUY_VOUCHER_ASK": "Do you have a promotional code?",
-
-		"SHOP__ADD_MONEY": "Credit account",
-		"SHOP__MONEY_CURRENTLY": "You currently have",
-
-		"SHOP__PAYPAL_OFFERS": "PayPal Offers",
-		"SHOP__PAYPAL_OFFER": "Offer",
-		"SHOP__PAYPAL_HISTORIES": "PayPal transaction history",
-		"SHOP__PAYPAL_MAIL": "Email",
-		"SHOP__PAYPAL_OFFER_ADD": "Add a PayPal offer",
-		"SHOP__PAYPAL_OFFER_ADD_SUCCESS": "PayPal Offer Successfully Added!",
-		"SHOP__PAYPAL_OFFER_EDIT": "Modify a PayPal offer",
-		"SHOP__PAYPAL_OFFER_EDIT_SUCCESS": "PayPal Offer Changed Successfully!",
-		"SHOP__PAYPAL_OFFER_DELETE_SUCCESS": "The PayPal offer has been deleted!",
-		"SHOP__PAYPAL_PAYMENT_ID": "PayPal ID",
-		"SHOP__PAYPAL_PAYMENT_DELAY": "Users can be credited up to 5min after payment on PayPal.This delay depends on the services of PayPal.",
-
-		"SHOP__NANO_OFFERS": "Nano Offers",
-		"SHOP__NANO_OFFER": "Offer",
-		"SHOP__NANO_HISTORIES": "Nano transaction history",
-		"SHOP__NANO_ADDRESS": "address (nano_...)",
-		"SHOP__NANO_OFFER_ADD": "Add a Nano offer",
-		"SHOP__NANO_OFFER_ADD_SUCCESS": "Nano Offer Successfully Added!",
-		"SHOP__NANO_OFFER_EDIT": "Modify a Nano offer",
-		"SHOP__NANO_OFFER_EDIT_SUCCESS": "Nano Offer Changed Successfully!",
-		"SHOP__NANO_OFFER_DELETE_SUCCESS": "The Nano offer has been deleted!",
-		"SHOP__ERROR_NANO_ADDRESS_NOT_VALID":"The Nano address in invalid!",
-		"SHOP__NANO_EXPLAIN_CONFIG_1":"To start, you need a wallet either on : ",
-		"SHOP__NANO_EXPLAIN_CONFIG_2":" or with the mobile application ",
-		"SHOP__NANO_EXPLAIN_CONFIG_3":"A short introduction of Nano is available on ",
-		"SHOP__NANO_EXPLAIN_CONFIG_4":"You can have more informations on ",
-		"SHOP__OFFER_MONEY_TO_ADD": "How many {MONEY_NAME} do you want to give?",
-
-		"SHOP__STARPASS_OFFERS": "StarPass Offers",
-		"SHOP__STARPASS_CODE": "Code",
-		"SHOP__STARPASS_OFFER": "Offer",
-		"SHOP__STARPASS_HISTORIES": "StarPass transaction history",
-		"SHOP__STARPASS_OFFER_DELETE_SUCCESS": "The StarPass offer has been deleted!",
-		"SHOP__STARPASS_OFFER_ADD": "Add a StarPass offer",
-		"SHOP__STARPASS_OFFER_ADD_SUCCESS": "StarPass Offer Successfully Added!",
-		"SHOP__STARPASS_OFFER_EDIT": "Edit a StarPass offer",
-		"SHOP__STARPASS_OFFER_EDIT_SUCCESS": "StarPass Offer Changed Successfully!",
-		"SHOP__STARPASS_PAYMENT": "Create account with StarPass",
-		"SHOP__STARPASS_PAYMENT_SUCCESS": "The StarPass transaction went off well! You received your credit shop.",
-		"SHOP__STARPASS_PAYMENT_ERROR": "The code you entered is wrong, please try again.",
-
-		"SHOP__DASHBOARD_GRAPH_ERROR": "You must have more than 5 different items sold to access the chart",
-		"SHOP__ADMIN_PART_2": "Administer the credits",
-		"SHOP__ADMIN_PART_1": "Go back to the shop",
-		"SHOP__HISTORY_TRANSFER_MONEY": "History of exchange",
-		"SHOP__HISTORY_PURCHASES": "Purchase History",
-		"SHOP__HISTORY_PURCHASES_MONEY": "{MONEY_NAME} 's Purchase History",
-
-		"PERMISSIONS__CREDIT_ACCOUNT": "Create account",
-		"PERMISSIONS__CAN_BUY": "Buy",
-		"PERMISSIONS__SHOP__ADMIN_MANAGE_ITEMS": "Manage articles of the shop (Add, edit, delete)",
-		"PERMISSIONS__SHOP__ADMIN_MANAGE_VOUCHERS": "Manage the promotional codes of the shop (Add, remove)",
-		"PERMISSIONS__SHOP__ADMIN_MANAGE_PAYMENT": "Manage the payments of the shop (Add, edit, delete, validate the PSC ...)",
-        "PERMISSIONS__VOTE__ADMIN_VIEW_TOP":"Go to the top vote page",
-        "PERMISSIONS__SHOP__ADMIN_GIFTALL":"Manage the gifts (donation of points)",
-        "PERMISSIONS__SHOP__ADMIN_MANAGE_CATEGORIES":"Manage store categories (Add, Edit, Delete)",
-
-		"NOTIFICATION__NEW_VOUCHER": "A new promotional code is available!",
-		"NOTIFICATION__NEW_PSC": "A new PaySafeCard must be validated!",
-		"NOTIFICATION__PAYPAL_IPN_VALIDED": "Your PayPal payment has been confirmed!",
-		"NOTIFICATION__NANO_VALIDED": "Your Nano payment has been confirmed!",
-
-		"HISTORY__CATEGORY_SHOP": "Shop",
-		"HISTORY__CATEGORY_CREDIT_SHOP": "Shop Creditation",
-		"HISTORY__ACTION_VALID_PAYSAFECARD": "Validation of a PaySafeCard",
-		"HISTORY__ACTION_DELETE_VOUCHER": "Suppression of a promotional code",
-		"HISTORY__ACTION_ADD_VOUCHER": "Adding a promotional code",
-		"HISTORY__ACTION_BUY_MONEY_DEDIPASS": "Purchase of credits by Dédipass",
-		"HISTORY__ACTION_EDIT_DEDIPASS_CONFIG": "Modifying the configuration of Dédipass",
-		"HISTORY__ACTION_DELETE_ITEM": "Deleting an item from the store",
-		"HISTORY__ACTION_ADD_ITEM": "Add an article on the shop",
-		"HISTORY__ACTION_ADD_CATEGORY": "Add a category to the store",
-		"HISTORY__ACTION_BUY_ITEM": "Purchase of",
-		"HISTORY__ACTION_BUY_MONEY": "Buying Shop Points",
-		"HISTORY__ACTION_SEND_MONEY": "Send money",
-		"HISTORY__ACTION_ADD_PAYPAL_OFFER": "Adding a PayPal offer",
-		"HISTORY__ACTION_ADD_NANO_OFFER": "Adding a Nano offer",
-		"HISTORY__ACTION_ADD_STARPASS_OFFER": "Adding a StarPass offer",
-		"HISTORY__ACTION_DELETE_PAYPAL_OFFER": "Deleting a PayPal offer",
-		"HISTORY__ACTION_DELETE_STARPASS_OFFER": "Deleting a StarPass offer",
-		"HISTORY__ACTION_EDIT_PAYPAL_OFFER": "Modification of a PayPal offer",
-		"HISTORY__ACTION_EDIT_STARPASS_OFFER": "Modification of a StarPass offer",
-		"HISTORY__ACTION_ENABLE_PAYSAFECARD": "Activation of the PaySafeCard payment method",
-		"HISTORY__ACTION_DISABLE_PAYSAFECARD": "Disabling the PaySafeCard payment method",
-		"HISTORY__ACTION_ADD_PAYSAFECARD": "Adding a PaySafeCard"
+  "SHOP__TITLE": "Shop",
+  "SHOP__GLOBAL_AMOUNT": "Amount",
+  "SHOP__MENU_CATEGORIES": "Manage categories",
+  "SHOP__MENU_ITEMS": "Manage articles",
+  "SHOP__MENU_VOUCHERS": "Manage promotions",
+  "SHOP__MENU_PAYMENTS": "Manage payments",
+  "SHOP__MENU_GIFT": "Gifts",
+  "SHOP__DUPLICATE": "Duplicate",
+  "SHOP__CONFIRM_DUPLICATE": "Do you really want to duplicate this article?",
+  "SHOP__ITEM_DUPLICATE_SUCCESS": "Article successfully duplicated!",
+  "SHOP__CATEGORY_EDIT": "Edit a cat\u00e9gory",
+  "SHOP__CATEGORIES_OTHER": "Categories not listed",
+  "SHOP__CATEGORY_EDIT_MESSAGE": "If you do not have any sections please first create one here :",
+  "SHOP__CATEGORIES_TIP": "f the feature is available on the theme, categories placed in unlisted will not be visible on the store page. They must be assigned to a section. And categories that will not be linked to a section will not be in the form of drop-down menus.",
+  "SHOP__SECTION_ADD": "Add a section",
+  "SHOP__SECTION": "Section",
+  "SHOP__SECTIONS": "Sections",
+  "SHOP__SECTION_EDIT_SUCCESS": "Section modified successfully!",
+  "SHOP__SECTION_ADD_SUCCESS": "Section added successfully!",
+  "SHOP__SECTION_TIP": "Attention, this feature is not available on all themes, however the use of categories remains possible if you choose not to link to a section. The sections are used to create drop-down menus with the categories contained in them.",
+  "SHOP__CATEGORY_ADD_NO": "Do not link the category to a section (it will be in the form of a button and not a drop-down menu)",
+  "SHOP__CATEGORIES_NO": "Categories not related to a section",
+  "SHOP__SECTION_AND_CATEGORIES": "Sections and Categories",
+  "SHOP__CONFIG": "Configuration",
+  "SHOP__SAVE_SUCCESS": "Saved!",
+  "SHOP__SAVE_IN_PROGRESS": "Automatic backup ...",
+  "SHOP__CONFIG_GOAL_TITLE": "Goal of the month",
+  "SHOP__CONFIG_GOAL_DESC": "Leave empty to remove",
+  "SHOP__CONFIG_SORT_BY_SERVER": "Sort articles and categories by server",
+  "SHOP__CONFIG_BROADCAST_GLOBAL": "Global order made with each purchase",
+  "SHOP__CONFIG_EXPLAIN_TITLE": "Rationale",
+  "SHOP__CONFIG_EXPLAIN": "The global order will be made on all the selected servers of the purchased article, you can disable this global message for an article when it is created or modified.",
+  "SHOP__CONFIG_VARIABLES": "Available variables",
+  "SHOP__CONFIG_VARIABLE_ITEM": "Name of the item purchased",
+  "SHOP__CONFIG_VARIABLE_QUANTITY": "Quantity of the purchased article",
+  "SHOP__CONFIG_VARIABLE_PLAYER": "Player who bought the item",
+  "SHOP__CONFIG_VARIABLE_SERVERNAME": "Name of the server where the item was purchased (Displayed under a comma-separated list if there is more than one)",
+  "SHOP__CONFIG_SAVE_SUCCESS": "The configuration has been saved!",
+  "SHOP__ADMIN_MANAGE_ITEMS": "Manage articles",
+  "SHOP__ADMIN_MANAGE_VOUCHERS": "Manage Promotions",
+  "SHOP__ADMIN_MANAGE_PAYMENT": "Manage Payments",
+  "SHOP__PAYPAL_RETURN_MSG": "Return to {WEBSITE_NAME} to collect points",
+  "SHOP__VOUCHERS_MANAGE": "Manage promotional codes",
+  "SHOP__VOUCHERS_HISTORIES": "History of the uses of promotional codes",
+  "SHOP__VOUCHER_END_DATE": "End date",
+  "SHOP__VOUCHER_START_DATE": "Start date",
+  "SHOP__VOUCHER_START_DATE_EXPLAIN": "If you set a start date other than now, your promotion may be pre-displayed on the store if the 'Displayed' option is checked, but your users will not be able to use it.",
+  "SHOP__VOUCHER_VALUE_LABEL": "Reduction",
+  "SHOP__VOUCHER_VALUE_INPUT": "In {MONEY_NAME} or percent",
+  "SHOP__VOUCHER_DISPLAYED": "Posted",
+  "SHOP__VOUCHER_CHOOSE_TYPE": "Choose the type",
+  "SHOP__VOUCHER_MSG_ONE_CATEGORY": "A promotion is in progress on the category {CATEGORY} with the code: {CODE} (Reduction {REDUCTION}).",
+  "SHOP__VOUCHER_MSG_MANY_CATEGORIES": "A promotion is underway on {CATEGORIES} categories with the code: {CODE} (Reduced {REDUCTION}).",
+  "SHOP__VOUCHER_MSG_ONE_ITEM": "A promotion is in progress on the article {ITEM} with the code: {CODE} (Reduction {REDUCTION}).",
+  "SHOP__VOUCHER_MSG_MANY_ITEMS": "A promotion is running on {ITEMS} items with the code: {CODE} (Reduced {REDUCTION}).",
+  "SHOP__VOUCHER_MSG_ALL": "A promotion is in progress on all the shop with the code: {CODE} (Reduction {REDUCTION}).",
+  "SHOP__VOUCHER_MSG_SOON": "A {REDUCTION} promotion will be available on {START_DATE}!",
+  "SHOP__VOUCHER_ADD": "Add a promotional code",
+  "SHOP__VOUCHER_SELECT": "Effective on",
+  "SHOP__VOUCHER_SELECT_CHOOSE": "Choose an option",
+  "SHOP__VOUCHER_GENERATE": "Generate a code",
+  "SHOP__VOUCHER_SELECT_ITEMS": "Choose an article (s)",
+  "SHOP__VOUCHER_SELECT_CATEGORIES": "Choose a category (s)",
+  "SHOP__VOUCHER_TYPE_PERCENTAGE": "Percentage",
+  "SHOP__VOUCHER_DISPLAY_CHECKBOX": "By ticking this box, the promotion will be displayed on the shop",
+  "SHOP__VOUCHER_ADD_SUCCESS": "The promotion has been added!",
+  "SHOP__VOUCHER_ADD_ERROR_CODE_INVALID": "Your code is invalid! (Can be alphanumeric only, # is allowed, maximum 20 characters)",
+  "SHOP__VOUCHER_DELETE_SUCCESS": "The promotion has been deleted!",
+  "SHOP__VOUCHER_LIMIT": "Limit of use",
+  "SHOP__VOUCHER_LIMIT_SHORT": "Limit",
+  "SHOP__VOUCHER_LIMIT_DESC": "Put 0 for no limit",
+  "SHOP__VOUCHER_LIMIT_TYPE": "Type of limit",
+  "SHOP__VOUCHER_LIMIT_TYPE_USER": "Per user",
+  "SHOP__VOUCHER_LIMIT_TYPE_GLOBAL": "Global",
+  "SHOP__VOUCHER_CODE": "Code",
+  "SHOP__VOUCHER_REDUCTION": "{MONEY_NAME} discount",
+  "SHOP__PAYSAFECARD": "PaySafeCard",
+  "SHOP__PAYSAFECARD_CODE": "Code",
+  "SHOP__PAYSAFECARD_VALID_USER": "Who validated?",
+  "SHOP__PAYSAFECARD_HISTORIES": "PaySafeCard transaction history",
+  "SHOP__PAYSAFECARD_ADMIN_TITLE": "List of PaySafeCards Pending",
+  "SHOP__PAYSAFECARD_DISABLE_SUCCESS": "The PaySafeCard have been deactivated!",
+  "SHOP__PAYSAFECARD_ENABLE_SUCCESS": "The PaySafeCard have been deactivated!",
+  "SHOP__PAYSAFECARD_ERROR_ALREADY_TOO_PSC_IN_DB": "You already have 2 PaySafeCard pending",
+  "SHOP__PAYSAFECARD_ERROR_ALREADY_IN_DB": "You already have this PaySafeCard waiting",
+  "SHOP__PAYSAFECARD_VALID_SUCCESS": "The PaySafeCard has been validated!",
+  "SHOP__PAYSAFECARD_INVALID_SUCCESS": "The PaySafeCard has been refused!",
+  "SHOP__PAYSAFECARD_ADD_SUCCESS": "The PaySafeCard has been added! You will receive an answer within 48h",
+  "SHOP__PAYSAFECARD_VALID_CONFIRM": "How many Shop Points do you want to give for this PaySafeCard?",
+  "SHOP__PAYSAFECARD_MESSAGE_VALID": "Your {AMOUNT} PaySafeCard has been validated! You earn {POINTS} {MONEY_NAME}.",
+  "SHOP__PAYSAFECARD_MESSAGE_INVALID": "Your {AMOUNT} PaySafeCard has been declined.",
+  "SHOP__PAYSAFECARD_ACCEPT": "Validate",
+  "SHOP__PAYSAFECARD_REFUSE": "Deny",
+  "SHOP__DEDIPASS_PAYMENT": "Pay with dedipass",
+  "SHOP__DEDIPASS_CONFIGURATION": "Dedipass Configuration",
+  "SHOP__DEDIPASS_EDIT_CONFIG_SUCCESS": "The configuration has been successfully edited!",
+  "SHOP__DEDIPASS_TOGGLE_ERROR_NO_CONFIG": "You can not activate Dedipass if you have not set up public key before!",
+  "SHOP__DEDIPASS_TOGGLE_ENABLE_SUCCESS": "You have successfully activated Dédipass as a payment method!",
+  "SHOP__DEDIPASS_TOGGLE_DISABLE_SUCCESS": "You have deactivated Dédipass as a payment method!",
+  "SHOP__DEDIPASS_PUBLICKEY": "Public key (called <i> data-dedipass </ i> in the installation part of Dédipass)",
+  "SHOP__DEDIPASS_HISTORIES": "Dedipass transaction history",
+  "SHOP__DEDIPASS_PAYMENT_ERROR_NOT_CONNECTED": "You were not logged in, please log in and try again (Code previously entered: {CODE}).",
+  "SHOP__DEDIPASS_PAYMENT_ERROR_INVAID_CODE": "The entered code is invalid.",
+  "SHOP__DEDIPASS_PAYMENT_ERROR_EMPTY_CODE": "Please enter a code.",
+  "SHOP__DEDIPASS_PAYMENT_ERROR_EMPTY_RATE": "Please choose an offer",
+  "SHOP__DEDIPASS_PAYMENT_SUCCESS": "The Dedipass transaction went well, you were credited with {MONEY} {MONEY_NAME}.",
+  "SHOP__DEDIPASS_CODE": "Code",
+  "SHOP__DEDIPASS_RATE": "Landing",
+  "SHOP__DEDIPASS_EXPLAIN_CONFIG": "To use Dédipass, you have to register on the <b> Dédipass </ b> website, then add a new service.You must choose <i> virtual currency </ i> and then configure the You will need the following URLs: ",
+  "SHOP__DEDIPASS_EXPLAIN_CONFIG_URL_1": "Installation URL",
+  "SHOP__DEDIPASS_EXPLAIN_CONFIG_URL_2": "Redirect URL",
+  "SHOP__USER_POINTS_TRANSFER": "Send money",
+  "SHOP__USER_POINTS_TRANSFER_ADMIN": "Transfer of points",
+  "SHOP__USER_POINTS_TRANSFER_HISTORIES": "{MONEY_NAME} transfer history between players",
+  "SHOP__USER_POINTS_TRANSFER_WHO": "Who?",
+  "SHOP__USER_POINTS_TRANSFER_HOW_MANY": "How much?",
+  "SHOP__USER_POINTS_TRANSFER_ERROR_EMPTY": "You can not send nothing",
+  "SHOP__USER_POINTS_TRANSFER_ERROR_YOURSELF": "You can not transfer credits to yourself",
+  "SHOP__USER_POINTS_TRANSFER_ERROR_DISABLED": "Point transfer is disabled.",
+  "SHOP__USER_POINTS_TRANSFER_ERROR_WAIT": "You have to wait for a while before you can transfer.",
+  "SHOP__USER_POINTS_TRANSFER_SUCCESS": "The money has been sent!",
+  "SHOP__TRANSFER_ENABLE_SUCCESS": "You have activated the transfer of points!",
+  "SHOP__TRANSFER_DISABLE_SUCCESS": "You have deactivated the transfer of points!",
+  "SHOP__GIFTALL": "Make a gift to everyone",
+  "SHOP__GIFTALL_VALUE": "Number of shop point(s) to be given to all users of the site",
+  "SHOP__GIFTALL_SUCCESS": "Your gift has been made",
+  "SHOP__ITEM": "Article",
+  "SHOP__ITEMS": "Articles",
+  "SHOP__ITEM_ADD_COMMAND": "Add an order",
+  "SHOP__ITEM_EDIT": "Editing an article",
+  "SHOP__ITEMS_AVAILABLE": "Items for sale",
+  "SHOP__ITEM_NAME": "Name",
+  "SHOP__ITEM_IMG_URL": "URL of the image",
+  "SHOP__ITEM_PRICE": "Price",
+  "SHOP__ITEM_QUANTITY": "Quantity",
+  "SHOP__ITEM_TOTAL": "Total",
+  "SHOP__ITEM_DESCRIPTION": "Description",
+  "SHOP__ITEM_EDIT_SUCCESS": "Article successfully modified!",
+  "SHOP__ITEM_DELETE_SUCCESS": "Article Deleted Successfully!",
+  "SHOP__ITEM_ADD_SUCCESS": "Article added successfully!",
+  "SHOP__ITEM_ADD": "Add an article",
+  "SHOP__ITEM_TIMED_COMMAND": "DIFFERENT COMMAND",
+  "SHOP__ITEM_TIMED_COMMAND_DESC": "This is a command that will be done after a certain time (for grades for example)",
+  "SHOP__ITEM_TIMED_COMMAND_TIME": "Time",
+  "SHOP__ITEM_DISPLAY_SERVER": "Show the server (s) where the article will be given.",
+  "SHOP__ITEM_CHECKBOX_CONNECT": "Require the player to be connected to the server to buy the article",
+  "SHOP__ITEM_CHECKBOX_DISPLAY": "Show article on the shop",
+  "SHOP__ITEM_MULTIPLE_BUY": "Allow this item to be purchased multiple times (in one purchase only)",
+  "SHOP__ITEM_CANT_BUY_MULTIPLE": "You can not buy this item (<i> {ITEM_NAME} </ i>) more than once",
+  "SHOP__ITEM_CART": "Allow add to cart of this article",
+  "SHOP__ITEM_CANT_ADDED_TO_CART": "You can not buy item <i> {ITEM_NAME} </ i> with a cart.",
+  "SHOP__ITEM_CANT_BUY_LIMIT": "You can not buy item <i> {ITEM_NAME} </ i> over {LIMIT} times.",
+  "SHOP__ITEM_BROADCAST_GLOBAL": "Make the global order when purchasing this item",
+  "SHOP__ITEM_PREREQUISITES": "Do you want to activate the prerequisites?",
+  "SHOP__ITEM_PREREQUISITES_TYPE_0": "No.",
+  "SHOP__ITEM_PREREQUISITES_TYPE_1": "Yes, the player must have purchased all the following items",
+  "SHOP__ITEM_PREREQUISITES_TYPE_2": "Yes, the player must have purchased at least one of the following items",
+  "SHOP__ITEM_PREREQUISITES_ITEMS": "Available items",
+  "SHOP__ITEM_CHECKBOX_REDUCTIONAL_ITEMS": "Activate price reduction if one or more of the following items are / are purchased",
+  "SHOP__ITEM_REDUCTIONAL_ITEMS_LIST": "A discount is applied to this item ({REDUCTION}) because you have already purchased the following items {ITEMS_LIST}.",
+  "SHOP__ITEM_CANT_BUY_PREREQUISITES_1": "You can not buy this item without purchasing all of the following items: {ITEMS}",
+  "SHOP__ITEM_CANT_BUY_PREREQUISITES_2": "You can not buy this item without purchasing at least one of the following items: {ITEMS}",
+  "SHOP__ITEM_GIVE_SKIN": "Give permission to change skin with the purchase of this article",
+  "SHOP__ITEM_GIVE_CAPE": "Give permission to change cape with the purchase of this article",
+  "SHOP__ITEM_CANT_BUY_NOT_CONNECTED": "You must be logged in to purchase item <b> {ITEM_NAME} </ b>!",
+  "SHOP__ITEM_BUY_LIMIT": "Purchase limit (how much a maximum item can be purchased)",
+  "SHOP__ITEM_BUY_LIMIT_PLACEHOLDER": "Put 0 for no limit",
+  "SHOP__ITEM_WAIT_TIME": "Time interval between purchases",
+  "SHOP__ITEM_CANT_BUY_WAIT_TIME": "You can not buy item <i> {ITEM_NAME} </ i> now! Every purchase must be spaced from {WAIT_TIME}.",
+  "SHOP__ITEMS_AVAILABLE_OTHER": "Items not listed",
+  "SHOP__ITEM_CURRENCY": "Currency (EUR, USD...)",
+  "SHOP__CATEGORIES": "Categories",
+  "SHOP__CATEGORY": "Category",
+  "SHOP__CATEGORY_ADD": "Add a category",
+  "SHOP__CATEGORY_ADD_SUCCESS": "Category added successfully!",
+  "SHOP__CATEGORY_EDIT_SUCCESS": "Category successfully modified!",
+  "SHOP__CATEGORY_DELETE_SUCCESS": "Category Successfully Deleted!",
+  "SHOP__CATEGORY_NUMBER": "Number of articles linked to the category",
+  "SHOP__BUY": "Buy",
+  "SHOP__BUY_CART": "See my cart",
+  "SHOP__BUY_CART_EMPTY": "Your cart is empty.",
+  "SHOP__BUY_ADD_TO_CART": "Add to cart",
+  "SHOP__BUY_ADDED_TO_CART": "Added to cart",
+  "SHOP__BUY_ERROR_NO_ENOUGH_MONEY": "You do not have enough money to make this purchase.",
+  "SHOP__BUY_ERROR_NEED_LOGIN": "You must be logged in to make a purchase.",
+  "SHOP__BUY_ERROR_EMPTY": "You can not buy anything.",
+  "SHOP__BUY_ERROR_NO_CONNECTED": "You must be logged in to make this purchase.",
+  "SHOP__BUY_CONFIRM": "Do you really want to buy this item?",
+  "SHOP__BUY_SUCCESS": "The purchase has just been made",
+  "SHOP__BUY_VOUCHER_ASK": "Do you have a promotional code?",
+  "SHOP__ADD_MONEY": "Credit account",
+  "SHOP__MONEY_CURRENTLY": "You currently have",
+  "SHOP__PAYPAL_OFFERS": "PayPal Offers",
+  "SHOP__PAYPAL_OFFER": "Offer",
+  "SHOP__PAYPAL_HISTORIES": "PayPal transaction history",
+  "SHOP__PAYPAL_MAIL": "Email",
+  "SHOP__PAYPAL_OFFER_ADD": "Add a PayPal offer",
+  "SHOP__PAYPAL_OFFER_ADD_SUCCESS": "PayPal Offer Successfully Added!",
+  "SHOP__PAYPAL_OFFER_EDIT": "Modify a PayPal offer",
+  "SHOP__PAYPAL_OFFER_EDIT_SUCCESS": "PayPal Offer Changed Successfully!",
+  "SHOP__PAYPAL_OFFER_DELETE_SUCCESS": "The PayPal offer has been deleted!",
+  "SHOP__PAYPAL_PAYMENT_ID": "PayPal ID",
+  "SHOP__PAYPAL_PAYMENT_DELAY": "Users can be credited up to 5min after payment on PayPal.This delay depends on the services of PayPal.",
+  "SHOP__NANO_OFFERS": "Nano Offers",
+  "SHOP__NANO_OFFER": "Offer",
+  "SHOP__NANO_HISTORIES": "Nano transaction history",
+  "SHOP__NANO_ADDRESS": "address (nano_...)",
+  "SHOP__NANO_OFFER_ADD": "Add a Nano offer",
+  "SHOP__NANO_OFFER_ADD_SUCCESS": "Nano Offer Successfully Added!",
+  "SHOP__NANO_OFFER_EDIT": "Modify a Nano offer",
+  "SHOP__NANO_OFFER_EDIT_SUCCESS": "Nano Offer Changed Successfully!",
+  "SHOP__NANO_OFFER_DELETE_SUCCESS": "The Nano offer has been deleted!",
+  "SHOP__ERROR_NANO_ADDRESS_NOT_VALID": "The Nano address in invalid!",
+  "SHOP__NANO_EXPLAIN_CONFIG_1": "To start, you need a wallet either on : ",
+  "SHOP__NANO_EXPLAIN_CONFIG_2": " or with the mobile application ",
+  "SHOP__NANO_EXPLAIN_CONFIG_3": "A short introduction of Nano is available on ",
+  "SHOP__NANO_EXPLAIN_CONFIG_4": "You can have more informations on ",
+  "SHOP__OFFER_MONEY_TO_ADD": "How many {MONEY_NAME} do you want to give?",
+  "SHOP__STARPASS_OFFERS": "StarPass Offers",
+  "SHOP__STARPASS_CODE": "Code",
+  "SHOP__STARPASS_OFFER": "Offer",
+  "SHOP__STARPASS_HISTORIES": "StarPass transaction history",
+  "SHOP__STARPASS_OFFER_DELETE_SUCCESS": "The StarPass offer has been deleted!",
+  "SHOP__STARPASS_OFFER_ADD": "Add a StarPass offer",
+  "SHOP__STARPASS_OFFER_ADD_SUCCESS": "StarPass Offer Successfully Added!",
+  "SHOP__STARPASS_OFFER_EDIT": "Edit a StarPass offer",
+  "SHOP__STARPASS_OFFER_EDIT_SUCCESS": "StarPass Offer Changed Successfully!",
+  "SHOP__STARPASS_PAYMENT": "Create account with StarPass",
+  "SHOP__STARPASS_PAYMENT_SUCCESS": "The StarPass transaction went off well! You received your credit shop.",
+  "SHOP__STARPASS_PAYMENT_ERROR": "The code you entered is wrong, please try again.",
+  "SHOP__DASHBOARD_GRAPH_ERROR": "You must have more than 5 different items sold to access the chart",
+  "SHOP__ADMIN_PART_2": "Administer the credits",
+  "SHOP__ADMIN_PART_1": "Go back to the shop",
+  "SHOP__HISTORY_TRANSFER_MONEY": "History of exchange",
+  "SHOP__HISTORY_PURCHASES": "Purchase History",
+  "SHOP__HISTORY_PURCHASES_MONEY": "{MONEY_NAME} 's Purchase History",
+  "PERMISSIONS__CREDIT_ACCOUNT": "Create account",
+  "PERMISSIONS__CAN_BUY": "Buy",
+  "PERMISSIONS__SHOP__ADMIN_MANAGE_ITEMS": "Manage articles of the shop (Add, edit, delete)",
+  "PERMISSIONS__SHOP__ADMIN_MANAGE_VOUCHERS": "Manage the promotional codes of the shop (Add, remove)",
+  "PERMISSIONS__SHOP__ADMIN_MANAGE_PAYMENT": "Manage the payments of the shop (Add, edit, delete, validate the PSC ...)",
+  "PERMISSIONS__VOTE__ADMIN_VIEW_TOP": "Go to the top vote page",
+  "PERMISSIONS__SHOP__ADMIN_GIFTALL": "Manage the gifts (donation of points)",
+  "PERMISSIONS__SHOP__ADMIN_MANAGE_CATEGORIES": "Manage store categories (Add, Edit, Delete)",
+  "NOTIFICATION__NEW_VOUCHER": "A new promotional code is available!",
+  "NOTIFICATION__NEW_PSC": "A new PaySafeCard must be validated!",
+  "NOTIFICATION__PAYPAL_IPN_VALIDED": "Your PayPal payment has been confirmed!",
+  "NOTIFICATION__NANO_VALIDED": "Your Nano payment has been confirmed!",
+  "HISTORY__CATEGORY_SHOP": "Shop",
+  "HISTORY__CATEGORY_CREDIT_SHOP": "Shop Creditation",
+  "HISTORY__ACTION_VALID_PAYSAFECARD": "Validation of a PaySafeCard",
+  "HISTORY__ACTION_DELETE_VOUCHER": "Suppression of a promotional code",
+  "HISTORY__ACTION_ADD_VOUCHER": "Adding a promotional code",
+  "HISTORY__ACTION_BUY_MONEY_DEDIPASS": "Purchase of credits by Dédipass",
+  "HISTORY__ACTION_EDIT_DEDIPASS_CONFIG": "Modifying the configuration of Dédipass",
+  "HISTORY__ACTION_DELETE_ITEM": "Deleting an item from the store",
+  "HISTORY__ACTION_ADD_ITEM": "Add an article on the shop",
+  "HISTORY__ACTION_ADD_CATEGORY": "Add a category to the store",
+  "HISTORY__ACTION_BUY_ITEM": "Purchase of",
+  "HISTORY__ACTION_BUY_MONEY": "Buying Shop Points",
+  "HISTORY__ACTION_SEND_MONEY": "Send money",
+  "HISTORY__ACTION_ADD_PAYPAL_OFFER": "Adding a PayPal offer",
+  "HISTORY__ACTION_ADD_NANO_OFFER": "Adding a Nano offer",
+  "HISTORY__ACTION_ADD_STARPASS_OFFER": "Adding a StarPass offer",
+  "HISTORY__ACTION_DELETE_PAYPAL_OFFER": "Deleting a PayPal offer",
+  "HISTORY__ACTION_DELETE_STARPASS_OFFER": "Deleting a StarPass offer",
+  "HISTORY__ACTION_EDIT_PAYPAL_OFFER": "Modification of a PayPal offer",
+  "HISTORY__ACTION_EDIT_STARPASS_OFFER": "Modification of a StarPass offer",
+  "HISTORY__ACTION_ENABLE_PAYSAFECARD": "Activation of the PaySafeCard payment method",
+  "HISTORY__ACTION_DISABLE_PAYSAFECARD": "Disabling the PaySafeCard payment method",
+  "HISTORY__ACTION_ADD_PAYSAFECARD": "Adding a PaySafeCard"
 }
diff --git a/lang/fr_FR.json b/lang/fr_FR.json
index a359845..cc3e4f7 100755
--- a/lang/fr_FR.json
+++ b/lang/fr_FR.json
@@ -2,6 +2,16 @@
   "SHOP__TITLE": "Boutique",
   "SHOP__GLOBAL_AMOUNT": "Montant",
 
+  "SHOP__MENU_CATEGORIES": "Gérer les catégories",
+  "SHOP__MENU_ITEMS": "Gérer les articles",
+  "SHOP__MENU_VOUCHERS": "Gérer les promotions",
+  "SHOP__MENU_PAYMENTS": "Gérer les paiements",
+  "SHOP__MENU_GIFT": "Cadeaux",
+
+  "SHOP__DUPLICATE": "Dupliquer",
+  "SHOP__CONFIRM_DUPLICATE": "Voulez-vous vraiment dupliquer cet article ?",
+  "SHOP__ITEM_DUPLICATE_SUCCESS": "Article dupliqué avec succès !",
+
   "SHOP__CONFIG": "Configuration",
   "SHOP__SAVE_SUCCESS": "Sauvegardé !",
   "SHOP__SAVE_IN_PROGRESS": "Sauvegarde automatique...",
@@ -14,6 +24,7 @@
   "SHOP__CONFIG_VARIABLES":"Variables diponibles",
   "SHOP__CONFIG_VARIABLE_ITEM":"Nom de l'article acheté",
   "SHOP__CONFIG_VARIABLE_QUANTITY":"Quantité de l'article acheté",
+  "NOT_4_CHARACTER": "Une case ne contient pas 4 caractères",
   "SHOP__CONFIG_VARIABLE_PLAYER":"Joueur ayant acheté l'article",
   "SHOP__CONFIG_VARIABLE_SERVERNAME":"Nom du serveur où l'article a été acheté (Affiché sous une liste avec des virgules si il y en a plus d'un)",
   "SHOP__CONFIG_SAVE_SUCCESS":"La configuration a bien été sauvegardée !",
@@ -161,11 +172,26 @@
   "SHOP__CATEGORIES": "Cat\u00e9gories",
   "SHOP__CATEGORY": "Cat\u00e9gorie",
   "SHOP__CATEGORY_ADD": "Ajouter une cat\u00e9gorie",
+  "SHOP__CATEGORY_EDIT": "Modifier une cat\u00e9gorie",
   "SHOP__CATEGORY_ADD_SUCCESS": "Cat\u00e9gorie ajout\u00e9e avec succ\u00e8s !",
   "SHOP__CATEGORY_EDIT_SUCCESS": "Cat\u00e9gorie modifi\u00e9 avec succ\u00e8s !",
   "SHOP__CATEGORY_DELETE_SUCCESS": "Cat\u00e9gorie supprim\u00e9e avec succ\u00e8s !",
   "SHOP__CATEGORY_NUMBER": "Nombre d'article lié à la catégorie",
 
+  "SHOP__CATEGORIES_OTHER": "Catégories non répertoriés",
+  "SHOP__CATEGORY_EDIT_MESSAGE": "Si vous n'avez aucune section veuillez d'abord en créer une ici :",
+  "SHOP__CATEGORIES_TIP": "Si la fonction est disponible sur le thème, les catégories placées en non répertoriés ne seront pas visibles sur la page de la boutique. Il faut donc les attribuer à une section. Et les catégories qui ne seront pas liées à une section ne seront pas sous forme de menus déroulants.",
+  "SHOP__CATEGORY_ADD_NO": "Ne pas lier la catégorie à une section (elle sera sous forme de boutton et non de menu déroulant)",
+  "SHOP__CATEGORIES_NO": "Catégories non liée à une section",
+
+  "SHOP__SECTION_ADD": "Ajouter une section",
+  "SHOP__SECTION": "Section",
+  "SHOP__SECTIONS": "Sections",
+  "SHOP__SECTION_EDIT_SUCCESS": "Section modifié avec succés !",
+  "SHOP__SECTION_ADD_SUCCESS": "Section ajout\u00e9e avec succ\u00e8s !",
+  "SHOP__SECTION_TIP": "Attention, cette fonctionnalité n'est pas disponible sur tous les thèmes, cependant l'utilisation des catégories reste possible si vous choisissez de ne pas les lier à une section. Les sections servent à créer des menus déroulants avec les catégories contenues dedans.",
+  "SHOP__SECTION_AND_CATEGORIES": "Sections et Catégories",
+
   "SHOP__BUY": "Acheter",
   "SHOP__BUY_CART":"Voir mon panier",
   "SHOP__BUY_CART_EMPTY":"Votre panier est vide.",
@@ -238,7 +264,6 @@
   "PERMISSIONS__VOTE__ADMIN_VIEW_TOP":"Accéder à la page du top vote",
   "PERMISSIONS__SHOP__ADMIN_GIFTALL":"Gérer les cadeaux (don de points)",
   "PERMISSIONS__SHOP__ADMIN_MANAGE_CATEGORIES":"Gérer les catégories de la boutique (Ajouter, éditer, supprimer)",
-  
 
   "NOTIFICATION__NEW_VOUCHER":"Un nouveau code promotionnel est disponible !",
   "NOTIFICATION__NEW_PSC":"Une nouvelle PaySafeCard doit être validée !",

From 0e5ca5121c7082348123ea24da175612b968e333 Mon Sep 17 00:00:00 2001
From: nivcoo <36514752+nivcoo@users.noreply.github.com>
Date: Wed, 23 Dec 2020 19:53:54 +0100
Subject: [PATCH 38/45] improv. remove useless code (#62)

---
 Controller/ShopController.php | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/Controller/ShopController.php b/Controller/ShopController.php
index e9f6921..cc9b020 100755
--- a/Controller/ShopController.php
+++ b/Controller/ShopController.php
@@ -41,7 +41,7 @@ function index($category = false)
         $histories_star = $this->StarpassHistory->find('all', ['conditions' => ['created LIKE' => date('Y') . '-' . date('m') . '-%']]);
 
         $best_donator_price = [];
-
+        $goal_money = 0;
         foreach ($histories_dedi as $value) {
             $money = $value["DedipassHistory"]["credits_gived"];
             $goal_money += floatval($money);
@@ -85,41 +85,27 @@ function index($category = false)
             $goal_bar_with = round((str_replace(",", '.', $goal_money * 100 / $goal_money_max)));
         }
 
-        $best_donator_exclude = array_diff_key($best_donator_price, [3 => 0, 1606 => 0]);
-
-
         $i = 0;
-        foreach ($best_donator_exclude as $key => $value) {
+        foreach ($best_donator_price as $key => $value) {
             if ($i == 3)
                 break;
-            $best_donator_id = array_search(max($best_donator_exclude), $best_donator_exclude);
+            $best_donator_id = array_search(max($best_donator_price), $best_donator_price);
             $best_donator[] = $this->User->find('first', ['conditions' => ['id' => $best_donator_id]]);
 
-            $best_donator_exclude = array_diff_key($best_donator_exclude, [$best_donator_id => $best_donator_exclude[$best_donator_id]]);
+            $best_donator_price = array_diff_key($best_donator_price, [$best_donator_id => $best_donator_price[$best_donator_id]]);
             $i++;
         }
-
-
-        //$best_donator_id = array_search(max($best_donator_exclude), $best_donator_exclude);
-        //$best_donator = $this->User->find('all', ['conditions' => ['id' => $best_donator_id], 'limit' => 5]);
-        //$best_donator = $best_donator;
-
-
         $this->loadModel('Shop.Section');
         $search_sections = $this->Section->find('all');
         $search_categories_without_section = $this->Category->find('all', array('conditions' => array('section' => 0), 'order' => 'order'));
         $search_categories_section = [];
-        $search_categories = [];
         if (!empty($search_sections)) foreach ($search_sections as $v) {
             $search_categories_section[$v['Section']['id']] = $this->Category->find('all', array('conditions' => array('section_id' => $v['Section']['id'], 'section' => 1), 'order' => 'order'));
-            $search_categories = $this->Category->find('all');
         }
-		
-        $search_categories = $this->Category->find('all'); // on cherche toutes les catégories et on envoie à la vue
-
+        $search_categories = $this->Category->find('all');
 
-        $search_first_category = $this->Category->find('first'); //
-        $search_first_category = @$search_first_category['Category']['id']; //
+        $search_first_category = $this->Category->find('first');
+        $search_first_category = @$search_first_category['Category']['id'];
 
         $this->loadModel('Shop.Paypal');
         $paypal_offers = $this->Paypal->find('all');

From 175603f802cab7d9e19dc45ca3f68fb5fad0d881 Mon Sep 17 00:00:00 2001
From: nivcoo <36514752+nivcoo@users.noreply.github.com>
Date: Wed, 23 Dec 2020 20:06:22 +0100
Subject: [PATCH 39/45] improv. up to adminlte3 (#61)

---
 View/Categories/admin_add_category.ctp |    8 +-
 View/Categories/admin_add_section.ctp  |    8 +-
 View/Categories/admin_edit.ctp         |    8 +-
 View/Categories/admin_index.ctp        |   24 +-
 View/Giftall/admin_index.ctp           |    8 +-
 View/Payment/admin_add_nano.ctp        |    8 +-
 View/Payment/admin_add_paypal.ctp      |    8 +-
 View/Payment/admin_add_starpass.ctp    |    8 +-
 View/Payment/admin_edit_nano.ctp       |    8 +-
 View/Payment/admin_edit_paypal.ctp     |    8 +-
 View/Payment/admin_edit_starpass.ctp   |    8 +-
 View/Payment/admin_index.ctp           | 1043 +++++++++++++-----------
 View/Shop/admin_add_item.ctp           |   19 +-
 View/Shop/admin_add_voucher.ctp        |   52 +-
 View/Shop/admin_edit.ctp               |   31 +-
 View/Shop/admin_index.ctp              |  318 ++++----
 View/Shop/admin_vouchers.ctp           |   16 +-
 config.json                            |    4 +-
 18 files changed, 826 insertions(+), 761 deletions(-)

diff --git a/View/Categories/admin_add_category.ctp b/View/Categories/admin_add_category.ctp
index 2b04430..9968f32 100644
--- a/View/Categories/admin_add_category.ctp
+++ b/View/Categories/admin_add_category.ctp
@@ -1,11 +1,11 @@
 <section class="content">
     <div class="row">
         <div class="col-md-12">
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title"><?= $Lang->get('SHOP__CATEGORY_ADD') ?></h3>
+            <div class="card">
+                <div class="card-header with-border">
+                    <h3 class="card-title"><?= $Lang->get('SHOP__CATEGORY_ADD') ?></h3>
                 </div>
-                <div class="box-body">
+                <div class="card-body">
                     <form action="" method="post" data-ajax="false">
 
                         <div class="ajax-msg"></div>
diff --git a/View/Categories/admin_add_section.ctp b/View/Categories/admin_add_section.ctp
index a65667b..6511d4e 100644
--- a/View/Categories/admin_add_section.ctp
+++ b/View/Categories/admin_add_section.ctp
@@ -1,11 +1,11 @@
 <section class="content">
     <div class="row">
         <div class="col-md-12">
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title"><?= $Lang->get('SHOP__SECTION_ADD') ?></h3>
+            <div class="card">
+                <div class="card-header with-border">
+                    <h3 class="card-title"><?= $Lang->get('SHOP__SECTION_ADD') ?></h3>
                 </div>
-                <div class="box-body">
+                <div class="card-body">
                     <form action="" method="post" data-ajax="false">
 
                         <div class="ajax-msg"></div>
diff --git a/View/Categories/admin_edit.ctp b/View/Categories/admin_edit.ctp
index a952294..1317b07 100644
--- a/View/Categories/admin_edit.ctp
+++ b/View/Categories/admin_edit.ctp
@@ -1,11 +1,11 @@
 <section class="content">
     <div class="row">
         <div class="col-md-12">
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title"><?= $Lang->get('SHOP__CATEGORY_EDIT') ?></h3>
+            <div class="card">
+                <div class="card-header with-border">
+                    <h3 class="card-title"><?= $Lang->get('SHOP__CATEGORY_EDIT') ?></h3>
                 </div>
-                <div class="box-body">
+                <div class="card-body">
                     <form action="" method="post" data-ajax="false">
 
                         <div class="ajax-msg"></div>
diff --git a/View/Categories/admin_index.ctp b/View/Categories/admin_index.ctp
index 2f9afa0..6d49791 100644
--- a/View/Categories/admin_index.ctp
+++ b/View/Categories/admin_index.ctp
@@ -7,11 +7,11 @@
             <div class="callout callout-warning"><h4><?= $Lang->get('SHOP__SECTION') ?></h4><?= $Lang->get('SHOP__SECTION_TIP') ?></div>
         </div>
         <div class="col-md-12">
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title"><?= $Lang->get('SHOP__SECTION_AND_CATEGORIES') ?></h3>
+            <div class="card">
+                <div class="card-header with-border">
+                    <h3 class="card-title"><?= $Lang->get('SHOP__SECTION_AND_CATEGORIES') ?></h3>
                 </div>
-                <div class="box-body">
+                <div class="card-body">
                     <table class="table table-bordered">
                         <thead>
                         <tr>
@@ -57,11 +57,11 @@
                     <button id="save" class="btn btn-success pull-right active" disabled="disabled"><?= $Lang->get('SHOP__SAVE_SUCCESS') ?></button>
                 </div>
             </div>
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title"><?= $Lang->get('SHOP__CATEGORIES_NO') ?></h3>
+            <div class="card">
+                <div class="card-header with-border">
+                    <h3 class="card-title"><?= $Lang->get('SHOP__CATEGORIES_NO') ?></h3>
                 </div>
-                <div class="box-body">
+                <div class="card-body">
                     <table class="table table-bordered">
                         <thead>
                         <tr>
@@ -90,11 +90,11 @@
                     <button id="save-2" class="btn btn-success pull-right active" disabled="disabled"><?= $Lang->get('SHOP__SAVE_SUCCESS') ?></button>
                 </div>
             </div>
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title"><?= $Lang->get('SHOP__CATEGORIES_OTHER') ?></h3>
+            <div class="card">
+                <div class="card-header with-border">
+                    <h3 class="card-title"><?= $Lang->get('SHOP__CATEGORIES_OTHER') ?></h3>
                 </div>
-                <div class="box-body">
+                <div class="card-body">
                     <table class="table table-bordered">
                         <thead>
                         <tr>
diff --git a/View/Giftall/admin_index.ctp b/View/Giftall/admin_index.ctp
index 793dcc0..d550dd9 100644
--- a/View/Giftall/admin_index.ctp
+++ b/View/Giftall/admin_index.ctp
@@ -1,11 +1,11 @@
 <section class="content">
     <div class="row">
         <div class="col-md-12">
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title"><?= $Lang->get('SHOP__GIFTALL') ?></h3>
+            <div class="card">
+                <div class="card-header with-border">
+                    <h3 class="card-title"><?= $Lang->get('SHOP__GIFTALL') ?></h3>
                 </div>
-                <div class="box-body">
+                <div class="card-body">
                     <form action="<?= $this->Html->url(array('action' => 'index')) ?>" method="post" data-ajax="true">
                         <div class="form-group">
                             <label><?= $Lang->get('SHOP__GIFTALL_VALUE') ?></label>
diff --git a/View/Payment/admin_add_nano.ctp b/View/Payment/admin_add_nano.ctp
index d9b80f6..4ea6710 100644
--- a/View/Payment/admin_add_nano.ctp
+++ b/View/Payment/admin_add_nano.ctp
@@ -1,11 +1,11 @@
 <section class="content">
   <div class="row">
     <div class="col-md-12">
-      <div class="box">
-        <div class="box-header with-border">
-          <h3 class="box-title"><?= $Lang->get('SHOP__NANO_OFFER_ADD') ?></h3>
+      <div class="card">
+        <div class="card-header with-border">
+          <h3 class="card-title"><?= $Lang->get('SHOP__NANO_OFFER_ADD') ?></h3>
         </div>
-        <div class="box-body">
+        <div class="card-body">
           <form action="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'add_nano_ajax', 'admin' => true)) ?>" method="post" data-ajax="true" data-redirect-url="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'index', 'admin' => true)) ?>">
 
             <div class="ajax-msg"></div>
diff --git a/View/Payment/admin_add_paypal.ctp b/View/Payment/admin_add_paypal.ctp
index 6c8b9c7..6bc3adc 100755
--- a/View/Payment/admin_add_paypal.ctp
+++ b/View/Payment/admin_add_paypal.ctp
@@ -1,11 +1,11 @@
 <section class="content">
   <div class="row">
     <div class="col-md-12">
-      <div class="box">
-        <div class="box-header with-border">
-          <h3 class="box-title"><?= $Lang->get('SHOP__PAYPAL_OFFER_ADD') ?></h3>
+      <div class="card">
+        <div class="card-header with-border">
+          <h3 class="card-title"><?= $Lang->get('SHOP__PAYPAL_OFFER_ADD') ?></h3>
         </div>
-        <div class="box-body">
+        <div class="card-body">
           <form action="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'add_paypal_ajax', 'admin' => true)) ?>" method="post" data-ajax="true" data-redirect-url="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'index', 'admin' => true)) ?>">
 
             <div class="ajax-msg"></div>
diff --git a/View/Payment/admin_add_starpass.ctp b/View/Payment/admin_add_starpass.ctp
index 979ae4e..667543d 100755
--- a/View/Payment/admin_add_starpass.ctp
+++ b/View/Payment/admin_add_starpass.ctp
@@ -6,11 +6,11 @@
   </div>
   <div class="row">
     <div class="col-md-12">
-      <div class="box">
-        <div class="box-header with-border">
-          <h3 class="box-title"><?= $Lang->get('SHOP__STARPASS_OFFER_ADD') ?></h3>
+      <div class="card">
+        <div class="card-header with-border">
+          <h3 class="card-title"><?= $Lang->get('SHOP__STARPASS_OFFER_ADD') ?></h3>
         </div>
-        <div class="box-body">
+        <div class="card-body">
           <form action="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'add_starpass_ajax', 'admin' => true)) ?>" method="post" data-ajax="true" data-redirect-url="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'index', 'admin' => true)) ?>">
 
             <div class="ajax-msg"></div>
diff --git a/View/Payment/admin_edit_nano.ctp b/View/Payment/admin_edit_nano.ctp
index 14a3407..4ebda81 100644
--- a/View/Payment/admin_edit_nano.ctp
+++ b/View/Payment/admin_edit_nano.ctp
@@ -1,11 +1,11 @@
 <section class="content">
   <div class="row">
     <div class="col-md-12">
-      <div class="box">
-        <div class="box-header with-border">
-          <h3 class="box-title"><?= $Lang->get('SHOP__NANO_OFFER_EDIT') ?></h3>
+      <div class="card">
+        <div class="card-header with-border">
+          <h3 class="card-title"><?= $Lang->get('SHOP__NANO_OFFER_EDIT') ?></h3>
         </div>
-        <div class="box-body">
+        <div class="card-body">
           <form action="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'edit_nano_ajax', 'admin' => true, $id)) ?>" method="post" data-ajax="true" data-redirect-url="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'index', 'admin' => true)) ?>">
 
             <div class="ajax-msg"></div>
diff --git a/View/Payment/admin_edit_paypal.ctp b/View/Payment/admin_edit_paypal.ctp
index 9de290e..d1148e9 100755
--- a/View/Payment/admin_edit_paypal.ctp
+++ b/View/Payment/admin_edit_paypal.ctp
@@ -1,11 +1,11 @@
 <section class="content">
   <div class="row">
     <div class="col-md-12">
-      <div class="box">
-        <div class="box-header with-border">
-          <h3 class="box-title"><?= $Lang->get('SHOP__PAYPAL_OFFER_EDIT') ?></h3>
+      <div class="card">
+        <div class="card-header with-border">
+          <h3 class="card-title"><?= $Lang->get('SHOP__PAYPAL_OFFER_EDIT') ?></h3>
         </div>
-        <div class="box-body">
+        <div class="card-body">
           <form action="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'edit_paypal_ajax', 'admin' => true, $id)) ?>" method="post" data-ajax="true" data-redirect-url="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'index', 'admin' => true)) ?>">
 
             <div class="ajax-msg"></div>
diff --git a/View/Payment/admin_edit_starpass.ctp b/View/Payment/admin_edit_starpass.ctp
index ccad8a7..7c50f12 100755
--- a/View/Payment/admin_edit_starpass.ctp
+++ b/View/Payment/admin_edit_starpass.ctp
@@ -6,11 +6,11 @@
   </div>
   <div class="row">
     <div class="col-md-12">
-      <div class="box">
-        <div class="box-header with-border">
-          <h3 class="box-title"><?= $Lang->get('SHOP__STARPASS_OFFER_EDIT') ?></h3>
+      <div class="card">
+        <div class="card-header with-border">
+          <h3 class="card-title"><?= $Lang->get('SHOP__STARPASS_OFFER_EDIT') ?></h3>
         </div>
-        <div class="box-body">
+        <div class="card-body">
           <form action="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'edit_starpass_ajax', 'admin' => true, $starpass['id'])) ?>" method="post" data-ajax="true" data-redirect-url="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'index', 'admin' => true)) ?>">
 
             <div class="ajax-msg"></div>
diff --git a/View/Payment/admin_index.ctp b/View/Payment/admin_index.ctp
index bd8c16a..f0b1f43 100755
--- a/View/Payment/admin_index.ctp
+++ b/View/Payment/admin_index.ctp
@@ -1,513 +1,560 @@
 <style media="screen">
-table tr td:last-child {
-  white-space: nowrap;
-  width: 1px;
-}
-table tr td:last-child > div.btn-group {
-  width: 170px;
-}
+    table tr td:last-child {
+        white-space: nowrap;
+        width: 1px;
+    }
+
+    table tr td:last-child > div.btn-group {
+        width: 170px;
+    }
 </style>
 <section class="content">
-  <div class="row">
-    <div class="col-md-12">
-      <div class="box">
-        <div class="box-header with-border">
-          <h3 class="box-title"><?= $Lang->get('SHOP__ADMIN_MANAGE_PAYMENT') ?></h3>
-        </div>
-        <div class="box-body">
-
-          <div class="nav-tabs-custom">
-            <ul class="nav nav-tabs">
-            <li class="active"><a href="#tab_nano" data-toggle="tab" aria-expanded="false">
-              <svg width="100" viewBox="0 0 210 30" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" class="logo">
-                <g>
-                  <path fill="black" d="m105.857,2.0836c-0.33,0 -0.604,0.1098 -0.81,0.3429c-0.206,0.2332 -0.302,0.5212 -0.302,0.8779l0,21.9047l-16.706,-22.5494c-0.261,-0.384 -0.59,-0.5761 -0.988,-0.5761c-0.385,0 -0.687,0.1098 -0.906,0.3429c-0.22,0.2332 -0.33,0.5212 -0.33,0.8779l0,24.8811c0,0.3841 0.082,0.6858 0.261,0.9053c0.178,0.2195 0.453,0.3292 0.837,0.3292c0.33,0 0.604,-0.1097 0.81,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-21.946l16.747,22.5906c0.302,0.3841 0.646,0.5761 1.03,0.5761c0.357,0 0.631,-0.1097 0.837,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-24.8812c0,-0.3841 -0.096,-0.6858 -0.288,-0.8916c-0.165,-0.2331 -0.439,-0.3429 -0.796,-0.3429zm87.786,-0.192c-7.605,0 -13.782,6.1723 -13.782,13.7711c0,7.5987 6.177,13.771 13.782,13.771c7.605,0 13.782,-6.1723 13.782,-13.771c0,-7.5851 -6.191,-13.7711 -13.782,-13.7711zm0,25.2927c-6.356,0 -11.531,-5.171 -11.531,-11.5216c0,-6.3506 5.175,-11.5216 11.531,-11.5216c6.355,0 11.531,5.171 11.531,11.5216c0,6.3506 -5.176,11.5216 -11.531,11.5216zm-63.53,-24.2914c-0.096,-0.2606 -0.275,-0.4527 -0.522,-0.6172c-0.247,-0.1509 -0.508,-0.2332 -0.782,-0.2332c-0.618,0 -1.03,0.2743 -1.263,0.8367l-11.174,25.0732c-0.055,0.096 -0.082,0.2468 -0.082,0.4252c0,0.3017 0.109,0.5486 0.329,0.7406c0.22,0.1921 0.481,0.2881 0.783,0.2881c0.48,0 0.837,-0.2469 1.07,-0.727l2.952,-6.6523l14.839,0l2.91,6.6523c0.096,0.2332 0.247,0.4115 0.439,0.535c0.192,0.1234 0.385,0.192 0.591,0.192c0.302,0 0.576,-0.096 0.809,-0.2881c0.234,-0.192 0.344,-0.4252 0.344,-0.6995c0,-0.1509 -0.042,-0.3017 -0.11,-0.4526l-11.133,-25.0732zm-7.811,17.0766l6.534,-14.786l6.507,14.786l-13.041,0zm48.389,-17.8859c-0.33,0 -0.604,0.1098 -0.796,0.3429c-0.206,0.2332 -0.302,0.5212 -0.302,0.8779l0,21.9047l-16.72,-22.5494c-0.261,-0.384 -0.59,-0.5761 -0.989,-0.5761c-0.384,0 -0.686,0.1098 -0.906,0.3429c-0.219,0.2332 -0.329,0.5212 -0.329,0.8779l0,24.8811c0,0.3841 0.082,0.6858 0.261,0.9053c0.178,0.2195 0.453,0.3292 0.837,0.3292c0.33,0 0.604,-0.1097 0.81,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-21.946l16.747,22.5906c0.302,0.3841 0.645,0.5761 1.03,0.5761c0.357,0 0.631,-0.1097 0.837,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-24.8812c0,-0.3841 -0.096,-0.6858 -0.288,-0.8916c-0.165,-0.2331 -0.439,-0.3429 -0.796,-0.3429z"/>
-                  <path fill="#4A90E2" d="m37.701,15.6633c0,2.5238 -2.0453,4.5538 -4.5574,4.5538c-2.5121,0 -4.5575,-2.0438 -4.5575,-4.5538c0,-3.4153 -1.1393,-4.5538 -4.5574,-4.5538c-3.4181,0 -4.5575,1.1385 -4.5575,4.5538c0,2.5238 -2.0453,4.5538 -4.5574,4.5538c-2.5121,0 -4.5575,-2.0438 -4.5575,-4.5538c0,-2.5238 2.0454,-4.5538 4.5575,-4.5538c3.4181,0 4.5574,-1.1384 4.5574,-4.5538c0,-2.5237 2.0454,-4.5537 4.5575,-4.5537c2.5121,0 4.5574,2.0437 4.5574,4.5537c0,3.4154 1.1394,4.5538 4.5575,4.5538c2.5258,0 4.5574,2.0437 4.5574,4.5538z"/>
-                  <path fill="#4A90E2" d="m5.7714,29.338c2.517,0 4.5575,-2.0388 4.5575,-4.5538c0,-2.5149 -2.0405,-4.5537 -4.5575,-4.5537c-2.517,0 -4.5574,2.0388 -4.5574,4.5537c0,2.515 2.0404,4.5538 4.5574,4.5538z"/>
-                  <path fill="#4A90E2" d="m65.087,6.5557c0,2.5238 -2.0454,4.5538 -4.5575,4.5538c-3.4181,0 -4.5574,1.1385 -4.5574,4.5538c0,2.5238 -2.0454,4.5538 -4.5575,4.5538c-3.4181,0 -4.5574,1.1384 -4.5574,4.5537c0,2.5238 -2.0454,4.5538 -4.5575,4.5538c-2.5121,0 -4.5574,-2.0437 -4.5574,-4.5538c0,-2.5237 2.0453,-4.5537 4.5574,-4.5537c3.4181,0 4.5575,-1.1385 4.5575,-4.5538c0,-2.5238 2.0453,-4.5538 4.5574,-4.5538c3.4181,0 4.5575,-1.1384 4.5575,-4.5538c0,-2.5237 2.0453,-4.5537 4.5574,-4.5537c2.5121,0 4.5575,2.03 4.5575,4.5537z"/>
-                </g>
-              </svg>
-              </a></li>
-              <li class=""><a href="#tab_starpass" data-toggle="tab" aria-expanded="true">StarPass</a></li>
-              <li class=""><a href="#tab_paypal" data-toggle="tab" aria-expanded="false">PayPal</a></li>
-              <li class=""><a href="#tab_psc" data-toggle="tab" aria-expanded="false">PaySafeCard</a></li>
-              <li class=""><a href="#tab_dedipass" data-toggle="tab" aria-expanded="false">Dédipass</a></li>
-              <li class=""><a href="#tab_points_transfer" data-toggle="tab" aria-expanded="false"><?= $Lang->get('SHOP__USER_POINTS_TRANSFER_ADMIN') ?></a></li>
-              <?= $Module->loadModules('shop_payments_modal_admin_tab') ?>
-              <li class="pull-right"><a href="#" class="text-muted"><i class="fa fa-gear"></i></a></li>
-            </ul>
-            <div class="tab-content">
-              <?= $Module->loadModules('shop_payments_modal_admin_tab_content') ?>
-              
-              <div class="tab-pane active" id="tab_nano">
-
-                <h3><?= $Lang->get('SHOP__NANO_OFFERS') ?> <a href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'add_nano', 'admin' => true)) ?>" class="btn btn-success pull-right"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
-
-                <br>
-                <div class="alert alert-info">
-                  <p>
-                    <?= $Lang->get('SHOP__NANO_EXPLAIN_CONFIG_1') ?><a target="_blank" href="https://app.brainblocks.io"><b>Brainblocks</b></a><?= $Lang->get('SHOP__NANO_EXPLAIN_CONFIG_2') ?><a target="_blank" href="https://natrium.io"><b>Natrium</b></a>
-                  </p>
-                  <p><?= $Lang->get('SHOP__NANO_EXPLAIN_CONFIG_3') ?><a target="_blank" href="https://www.youtube.com/watch?v=ydVomoXEGe0"><b>YouTube (English)</b></a></p>
-                  <p><?= $Lang->get('SHOP__NANO_EXPLAIN_CONFIG_4') ?><a target="_blank" href="https://www.nano.org/"><b>Nano.org</b></a></p>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <div class="card-header with-border">
+                    <h3 class="card-title"><?= $Lang->get('SHOP__ADMIN_MANAGE_PAYMENT') ?></h3>
                 </div>
+                <div class="card-body">
+
+
+                    <div class="nav-tabs-custom">
+                        <ul class="nav nav-tabs">
+                            <li class="nav-item"><a class="nav-link text-dark active" href="#tab_nano"
+                                                    data-toggle="tab" aria-expanded="false">
+                                    <svg width="100" viewBox="0 0 210 30" xmlns="http://www.w3.org/2000/svg"
+                                         class="logo">
+                                        <g>
+                                            <path fill="black"
+                                                  d="m105.857,2.0836c-0.33,0 -0.604,0.1098 -0.81,0.3429c-0.206,0.2332 -0.302,0.5212 -0.302,0.8779l0,21.9047l-16.706,-22.5494c-0.261,-0.384 -0.59,-0.5761 -0.988,-0.5761c-0.385,0 -0.687,0.1098 -0.906,0.3429c-0.22,0.2332 -0.33,0.5212 -0.33,0.8779l0,24.8811c0,0.3841 0.082,0.6858 0.261,0.9053c0.178,0.2195 0.453,0.3292 0.837,0.3292c0.33,0 0.604,-0.1097 0.81,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-21.946l16.747,22.5906c0.302,0.3841 0.646,0.5761 1.03,0.5761c0.357,0 0.631,-0.1097 0.837,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-24.8812c0,-0.3841 -0.096,-0.6858 -0.288,-0.8916c-0.165,-0.2331 -0.439,-0.3429 -0.796,-0.3429zm87.786,-0.192c-7.605,0 -13.782,6.1723 -13.782,13.7711c0,7.5987 6.177,13.771 13.782,13.771c7.605,0 13.782,-6.1723 13.782,-13.771c0,-7.5851 -6.191,-13.7711 -13.782,-13.7711zm0,25.2927c-6.356,0 -11.531,-5.171 -11.531,-11.5216c0,-6.3506 5.175,-11.5216 11.531,-11.5216c6.355,0 11.531,5.171 11.531,11.5216c0,6.3506 -5.176,11.5216 -11.531,11.5216zm-63.53,-24.2914c-0.096,-0.2606 -0.275,-0.4527 -0.522,-0.6172c-0.247,-0.1509 -0.508,-0.2332 -0.782,-0.2332c-0.618,0 -1.03,0.2743 -1.263,0.8367l-11.174,25.0732c-0.055,0.096 -0.082,0.2468 -0.082,0.4252c0,0.3017 0.109,0.5486 0.329,0.7406c0.22,0.1921 0.481,0.2881 0.783,0.2881c0.48,0 0.837,-0.2469 1.07,-0.727l2.952,-6.6523l14.839,0l2.91,6.6523c0.096,0.2332 0.247,0.4115 0.439,0.535c0.192,0.1234 0.385,0.192 0.591,0.192c0.302,0 0.576,-0.096 0.809,-0.2881c0.234,-0.192 0.344,-0.4252 0.344,-0.6995c0,-0.1509 -0.042,-0.3017 -0.11,-0.4526l-11.133,-25.0732zm-7.811,17.0766l6.534,-14.786l6.507,14.786l-13.041,0zm48.389,-17.8859c-0.33,0 -0.604,0.1098 -0.796,0.3429c-0.206,0.2332 -0.302,0.5212 -0.302,0.8779l0,21.9047l-16.72,-22.5494c-0.261,-0.384 -0.59,-0.5761 -0.989,-0.5761c-0.384,0 -0.686,0.1098 -0.906,0.3429c-0.219,0.2332 -0.329,0.5212 -0.329,0.8779l0,24.8811c0,0.3841 0.082,0.6858 0.261,0.9053c0.178,0.2195 0.453,0.3292 0.837,0.3292c0.33,0 0.604,-0.1097 0.81,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-21.946l16.747,22.5906c0.302,0.3841 0.645,0.5761 1.03,0.5761c0.357,0 0.631,-0.1097 0.837,-0.3429c0.206,-0.2332 0.302,-0.5212 0.302,-0.8778l0,-24.8812c0,-0.3841 -0.096,-0.6858 -0.288,-0.8916c-0.165,-0.2331 -0.439,-0.3429 -0.796,-0.3429z"/>
+                                            <path fill="#4A90E2"
+                                                  d="m37.701,15.6633c0,2.5238 -2.0453,4.5538 -4.5574,4.5538c-2.5121,0 -4.5575,-2.0438 -4.5575,-4.5538c0,-3.4153 -1.1393,-4.5538 -4.5574,-4.5538c-3.4181,0 -4.5575,1.1385 -4.5575,4.5538c0,2.5238 -2.0453,4.5538 -4.5574,4.5538c-2.5121,0 -4.5575,-2.0438 -4.5575,-4.5538c0,-2.5238 2.0454,-4.5538 4.5575,-4.5538c3.4181,0 4.5574,-1.1384 4.5574,-4.5538c0,-2.5237 2.0454,-4.5537 4.5575,-4.5537c2.5121,0 4.5574,2.0437 4.5574,4.5537c0,3.4154 1.1394,4.5538 4.5575,4.5538c2.5258,0 4.5574,2.0437 4.5574,4.5538z"/>
+                                            <path fill="#4A90E2"
+                                                  d="m5.7714,29.338c2.517,0 4.5575,-2.0388 4.5575,-4.5538c0,-2.5149 -2.0405,-4.5537 -4.5575,-4.5537c-2.517,0 -4.5574,2.0388 -4.5574,4.5537c0,2.515 2.0404,4.5538 4.5574,4.5538z"/>
+                                            <path fill="#4A90E2"
+                                                  d="m65.087,6.5557c0,2.5238 -2.0454,4.5538 -4.5575,4.5538c-3.4181,0 -4.5574,1.1385 -4.5574,4.5538c0,2.5238 -2.0454,4.5538 -4.5575,4.5538c-3.4181,0 -4.5574,1.1384 -4.5574,4.5537c0,2.5238 -2.0454,4.5538 -4.5575,4.5538c-2.5121,0 -4.5574,-2.0437 -4.5574,-4.5538c0,-2.5237 2.0453,-4.5537 4.5574,-4.5537c3.4181,0 4.5575,-1.1385 4.5575,-4.5538c0,-2.5238 2.0453,-4.5538 4.5574,-4.5538c3.4181,0 4.5575,-1.1384 4.5575,-4.5538c0,-2.5237 2.0453,-4.5537 4.5574,-4.5537c2.5121,0 4.5575,2.03 4.5575,4.5537z"/>
+                                        </g>
+                                    </svg>
+                                </a></li>
+                            <li class="nav-item"><a class="nav-link text-dark" href="#tab_starpass" data-toggle="tab"
+                                                    aria-expanded="true">StarPass</a></li>
+                            <li class="nav-item"><a class="nav-link text-dark" href="#tab_paypal" data-toggle="tab"
+                                                    aria-expanded="false">PayPal</a></li>
+                            <li class="nav-item"><a class="nav-link text-dark" href="#tab_psc" data-toggle="tab"
+                                                    aria-expanded="false">PaySafeCard</a></li>
+                            <li class="nav-item"><a class="nav-link text-dark" href="#tab_dedipass" data-toggle="tab"
+                                                    aria-expanded="false">Dédipass</a></li>
+                            <li class="nav-item"><a class="nav-link text-dark" href="#tab_points_transfer"
+                                                    data-toggle="tab"
+                                                    aria-expanded="false"><?= $Lang->get('SHOP__USER_POINTS_TRANSFER_ADMIN') ?></a>
+                            </li>
+                            <?= $Module->loadModules('shop_payments_modal_admin_tab') ?>
+                        </ul>
+                        <div class="tab-content">
+                            <?= $Module->loadModules('shop_payments_modal_admin_tab_content') ?>
+
+                            <div class="tab-pane fade show active" id="tab_nano">
+
+                                <h3><?= $Lang->get('SHOP__NANO_OFFERS') ?> <a
+                                            href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'add_nano', 'admin' => true)) ?>"
+                                            class="btn btn-success pull-right"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
+
+                                <br>
+                                <div class="alert alert-info">
+                                    <p>
+                                        <?= $Lang->get('SHOP__NANO_EXPLAIN_CONFIG_1') ?><a target="_blank"
+                                                                                           href="https://app.brainblocks.io"><b>Brainblocks</b></a><?= $Lang->get('SHOP__NANO_EXPLAIN_CONFIG_2') ?>
+                                        <a target="_blank" href="https://natrium.io"><b>Natrium</b></a>
+                                    </p>
+                                    <p><?= $Lang->get('SHOP__NANO_EXPLAIN_CONFIG_3') ?><a target="_blank"
+                                                                                          href="https://www.youtube.com/watch?v=ydVomoXEGe0"><b>YouTube
+                                                (English)</b></a></p>
+                                    <span><?= $Lang->get('SHOP__NANO_EXPLAIN_CONFIG_4') ?><a target="_blank"
+                                                                                             href="https://www.nano.org/"><b>Nano.org</b></a>
+                                    </span>
+                                </div>
+
+                                <table class="table table-bordered">
+                                    <thead>
+                                    <tr>
+                                        <th><?= $Lang->get('GLOBAL__NAME') ?></th>
+                                        <th><?= $Lang->get('SHOP__NANO_ADDRESS') ?></th>
+                                        <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
+                                        <th><?= $Lang->get('SHOP__ITEM_CURRENCY') ?></th>
+                                        <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
+                                        <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
+                                        <th><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <?php if (isset($offers['nano'])) { ?>
+                                        <?php foreach ($offers['nano'] as $key => $value) { ?>
+                                            <tr>
+                                                <td><?= $value['Nano']['name'] ?></td>
+                                                <td><?= $value['Nano']['address'] ?></td>
+                                                <td><?= $value['Nano']['price'] ?></td>
+                                                <td><?= $value['Nano']['currency'] ?></td>
+                                                <td><?= $value['Nano']['money'] ?></td>
+                                                <td><?= $Lang->date($value['Nano']['created']) ?></td>
+                                                <td>
+                                                    <div class="btn-group" role="group">
+                                                        <a href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'edit_nano/' . $value["Nano"]["id"], 'admin' => true)) ?>"
+                                                           class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
+                                                        <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/nano/' . $value["Nano"]["id"], 'admin' => true)) ?>')"
+                                                           class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        <?php } ?>
+                                    <?php } ?>
+                                    </tbody>
+                                </table>
+
+                                <hr>
+
+                                <h3><?= $Lang->get('SHOP__NANO_HISTORIES') ?></h3>
+
+                                <table class="table table-bordered dataTable" id="histories_nano">
+                                    <thead>
+                                    <tr>
+                                        <th><?= $Lang->get('USER__USERNAME') ?></th>
+                                        <th><?= $Lang->get('SHOP__NANO_OFFER') ?></th>
+                                        <th><?= $Lang->get('SHOP__GLOBAL_AMOUNT') ?></th>
+                                        <th><?= $Lang->get('SHOP__ITEM_CURRENCY') ?></th>
+                                        <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
+                                        <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    </tbody>
+                                </table>
+                                <script type="text/javascript">
+                                    $(document).ready(function () {
+                                        $('#histories_nano').DataTable({
+                                            "paging": true,
+                                            "lengthChange": false,
+                                            "searching": false,
+                                            "ordering": false,
+                                            "info": false,
+                                            "autoWidth": false,
+                                            'searching': true,
+                                            "bProcessing": true,
+                                            "bServerSide": true,
+                                            "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_nano_histories')) ?>",
+                                            "aoColumns": [
+                                                {mData: "User.pseudo"},
+                                                {mData: "Nano.name"},
+                                                {mData: "NanoHistory.payment_amount"},
+                                                {mData: "NanoHistory.currency"},
+                                                {mData: "NanoHistory.credits_gived"},
+                                                {mData: "NanoHistory.created"}
+                                            ],
+                                        });
+                                    });
+                                </script>
 
-                <table class="table table-bordered">
-                  <thead>
-                    <tr>
-                      <th><?= $Lang->get('GLOBAL__NAME') ?></th>
-                      <th><?= $Lang->get('SHOP__NANO_ADDRESS') ?></th>
-                      <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
-                      <th><?= $Lang->get('SHOP__ITEM_CURRENCY') ?></th>
-                      <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
-                      <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
-                      <th><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <?php if(isset($offers['nano'])) { ?>
-                      <?php foreach ($offers['nano'] as $key => $value) { ?>
-                        <tr>
-                          <td><?= $value['Nano']['name'] ?></td>
-                          <td><?= $value['Nano']['address'] ?></td>
-                          <td><?= $value['Nano']['price'] ?></td>
-                          <td><?= $value['Nano']['currency'] ?></td>
-                          <td><?= $value['Nano']['money'] ?></td>
-                          <td><?= $Lang->date($value['Nano']['created']) ?></td>
-                          <td>
-                            <div class="btn-group" role="group">
-                              <a href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'edit_nano/'.$value["Nano"]["id"], 'admin' => true)) ?>" class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
-                              <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/nano/'.$value["Nano"]["id"], 'admin' => true)) ?>')" class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
                             </div>
-                          </td>
-                        </tr>
-                      <?php } ?>
-                    <?php } ?>
-                  </tbody>
-                </table>
-
-                <hr>
-
-                <h3><?= $Lang->get('SHOP__NANO_HISTORIES') ?></h3>
-
-                <table class="table table-bordered dataTable" id="histories_nano">
-                  <thead>
-                    <tr>
-                      <th><?= $Lang->get('USER__USERNAME') ?></th>
-                      <th><?= $Lang->get('SHOP__NANO_OFFER') ?></th>
-                      <th><?= $Lang->get('SHOP__GLOBAL_AMOUNT') ?></th>
-                      <th><?= $Lang->get('SHOP__ITEM_CURRENCY') ?></th>
-                      <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
-                      <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                  </tbody>
-                </table>
-                <script type="text/javascript">
-                $(document).ready(function() {
-                  $('#histories_nano').DataTable({
-                    "paging": true,
-                    "lengthChange": false,
-                    "searching": false,
-                    "ordering": false,
-                    "info": false,
-                    "autoWidth": false,
-                    'searching': true,
-                    "bProcessing": true,
-                    "bServerSide": true,
-                    "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_nano_histories')) ?>",
-                    "aoColumns": [
-                        {mData:"User.pseudo"},
-                        {mData:"Nano.name"},
-                        {mData:"NanoHistory.payment_amount"},
-                        {mData:"NanoHistory.currency"},
-                        {mData:"NanoHistory.credits_gived"},
-                        {mData:"NanoHistory.created"}
-                    ],
-                  });
-                });
-                </script>
-
-              </div>
-              
-              <div class="tab-pane" id="tab_starpass">
-
-                <h3><?= $Lang->get('SHOP__STARPASS_OFFERS') ?> <a href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'add_starpass', 'admin' => true)) ?>" class="btn btn-success pull-right"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
-
-                <br><br>
-
-                <table class="table table-bordered">
-                  <thead>
-                    <tr>
-                      <th><?= $Lang->get('GLOBAL__NAME') ?></th>
-                      <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
-                      <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
-                      <th><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <?php if(isset($offers['starpass'])) { ?>
-                      <?php foreach ($offers['starpass'] as $key => $value) { ?>
-                        <tr>
-                          <td><?= $value['Starpass']['name'] ?></td>
-                          <td><?= $value['Starpass']['money'] ?></td>
-                          <td><?= $Lang->date($value['Starpass']['created']) ?></td>
-                          <td>
-                            <div class="btn-group" role="group">
-                              <a href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'edit_starpass/'.$value["Starpass"]["id"], 'admin' => true)) ?>" class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
-                              <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/starpass/'.$value["Starpass"]["id"], 'admin' => true)) ?>')" class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+
+                            <div class="tab-pane fade" id="tab_starpass">
+
+                                <h3><?= $Lang->get('SHOP__STARPASS_OFFERS') ?> <a
+                                            href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'add_starpass', 'admin' => true)) ?>"
+                                            class="btn btn-success pull-right"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
+
+                                <br><br>
+
+                                <table class="table table-bordered">
+                                    <thead>
+                                    <tr>
+                                        <th><?= $Lang->get('GLOBAL__NAME') ?></th>
+                                        <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
+                                        <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
+                                        <th><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <?php if (isset($offers['starpass'])) { ?>
+                                        <?php foreach ($offers['starpass'] as $key => $value) { ?>
+                                            <tr>
+                                                <td><?= $value['Starpass']['name'] ?></td>
+                                                <td><?= $value['Starpass']['money'] ?></td>
+                                                <td><?= $Lang->date($value['Starpass']['created']) ?></td>
+                                                <td>
+                                                    <div class="btn-group" role="group">
+                                                        <a href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'edit_starpass/' . $value["Starpass"]["id"], 'admin' => true)) ?>"
+                                                           class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
+                                                        <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/starpass/' . $value["Starpass"]["id"], 'admin' => true)) ?>')"
+                                                           class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        <?php } ?>
+                                    <?php } ?>
+                                    </tbody>
+                                </table>
+
+                                <hr>
+
+                                <h3><?= $Lang->get('SHOP__STARPASS_HISTORIES') ?></h3>
+
+                                <table class="table table-bordered dataTable" id="histories_starpass">
+                                    <thead>
+                                    <tr>
+                                        <th><?= $Lang->get('SHOP__STARPASS_CODE') ?></th>
+                                        <th><?= $Lang->get('USER__USERNAME') ?></th>
+                                        <th><?= $Lang->get('SHOP__STARPASS_OFFER') ?></th>
+                                        <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
+                                        <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    </tbody>
+                                </table>
+
+                                <script type="text/javascript">
+                                    $(document).ready(function () {
+                                        $('#histories_starpass').DataTable({
+                                            "paging": true,
+                                            "lengthChange": false,
+                                            "searching": false,
+                                            "ordering": false,
+                                            "info": false,
+                                            "autoWidth": false,
+                                            'searching': true,
+                                            "bProcessing": true,
+                                            "bServerSide": true,
+                                            "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_starpass_histories')) ?>",
+                                            "aoColumns": [
+                                                {mData: "StarpassHistory.code"},
+                                                {mData: "User.pseudo"},
+                                                {mData: "Starpass.name"},
+                                                {mData: "StarpassHistory.credits_gived"},
+                                                {mData: "StarpassHistory.created"}
+                                            ],
+                                        });
+                                    });
+                                </script>
+
                             </div>
-                          </td>
-                        </tr>
-                      <?php } ?>
-                    <?php } ?>
-                  </tbody>
-                </table>
-
-                <hr>
-
-                <h3><?= $Lang->get('SHOP__STARPASS_HISTORIES') ?></h3>
-
-                <table class="table table-bordered dataTable" id="histories_starpass">
-                  <thead>
-                    <tr>
-                      <th><?= $Lang->get('SHOP__STARPASS_CODE') ?></th>
-                      <th><?= $Lang->get('USER__USERNAME') ?></th>
-                      <th><?= $Lang->get('SHOP__STARPASS_OFFER') ?></th>
-                      <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
-                      <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                  </tbody>
-                </table>
-
-                <script type="text/javascript">
-                $(document).ready(function() {
-                  $('#histories_starpass').DataTable({
-                    "paging": true,
-                    "lengthChange": false,
-                    "searching": false,
-                    "ordering": false,
-                    "info": false,
-                    "autoWidth": false,
-                    'searching': true,
-                    "bProcessing": true,
-                    "bServerSide": true,
-                    "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_starpass_histories')) ?>",
-                    "aoColumns": [
-                        {mData:"StarpassHistory.code"},
-                        {mData:"User.pseudo"},
-                        {mData:"Starpass.name"},
-                        {mData:"StarpassHistory.credits_gived"},
-                        {mData:"StarpassHistory.created"}
-                    ],
-                  });
-                });
-                </script>
-
-              </div>
-
-              <div class="tab-pane" id="tab_paypal">
-
-                <h3><?= $Lang->get('SHOP__PAYPAL_OFFERS') ?> <a href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'add_paypal', 'admin' => true)) ?>" class="btn btn-success pull-right"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
-
-                <br>
-                <div class="alert alert-info">
-                  <b><?= $Lang->get('GLOBAL__INFO') ?></b> <?= $Lang->get('SHOP__PAYPAL_PAYMENT_DELAY') ?>
-                </div>
 
-                <table class="table table-bordered">
-                  <thead>
-                    <tr>
-                      <th><?= $Lang->get('GLOBAL__NAME') ?></th>
-                      <th><?= $Lang->get('SHOP__PAYPAL_MAIL') ?></th>
-                      <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
-                      <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
-                      <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
-                      <th><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <?php if(isset($offers['paypal'])) { ?>
-                      <?php foreach ($offers['paypal'] as $key => $value) { ?>
-                        <tr>
-                          <td><?= $value['Paypal']['name'] ?></td>
-                          <td><?= $value['Paypal']['email'] ?></td>
-                          <td><?= $value['Paypal']['price'] ?></td>
-                          <td><?= $value['Paypal']['money'] ?></td>
-                          <td><?= $Lang->date($value['Paypal']['created']) ?></td>
-                          <td>
-                            <div class="btn-group" role="group">
-                              <a href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'edit_paypal/'.$value["Paypal"]["id"], 'admin' => true)) ?>" class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
-                              <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/paypal/'.$value["Paypal"]["id"], 'admin' => true)) ?>')" class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+                            <div class="tab-pane fade" id="tab_paypal">
+
+                                <h3><?= $Lang->get('SHOP__PAYPAL_OFFERS') ?> <a
+                                            href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'add_paypal', 'admin' => true)) ?>"
+                                            class="btn btn-success pull-right"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
+
+                                <br>
+                                <div class="alert alert-info">
+                                    <b><?= $Lang->get('GLOBAL__INFO') ?></b> <?= $Lang->get('SHOP__PAYPAL_PAYMENT_DELAY') ?>
+                                </div>
+
+                                <table class="table table-bordered">
+                                    <thead>
+                                    <tr>
+                                        <th><?= $Lang->get('GLOBAL__NAME') ?></th>
+                                        <th><?= $Lang->get('SHOP__PAYPAL_MAIL') ?></th>
+                                        <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
+                                        <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
+                                        <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
+                                        <th><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <?php if (isset($offers['paypal'])) { ?>
+                                        <?php foreach ($offers['paypal'] as $key => $value) { ?>
+                                            <tr>
+                                                <td><?= $value['Paypal']['name'] ?></td>
+                                                <td><?= $value['Paypal']['email'] ?></td>
+                                                <td><?= $value['Paypal']['price'] ?></td>
+                                                <td><?= $value['Paypal']['money'] ?></td>
+                                                <td><?= $Lang->date($value['Paypal']['created']) ?></td>
+                                                <td>
+                                                    <div class="btn-group" role="group">
+                                                        <a href="<?= $this->Html->url(array('controller' => 'payment', 'action' => 'edit_paypal/' . $value["Paypal"]["id"], 'admin' => true)) ?>"
+                                                           class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
+                                                        <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/paypal/' . $value["Paypal"]["id"], 'admin' => true)) ?>')"
+                                                           class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        <?php } ?>
+                                    <?php } ?>
+                                    </tbody>
+                                </table>
+
+                                <hr>
+
+                                <h3><?= $Lang->get('SHOP__PAYPAL_HISTORIES') ?></h3>
+
+                                <table class="table table-bordered dataTable" id="histories_paypal">
+                                    <thead>
+                                    <tr>
+                                        <th><?= $Lang->get('SHOP__PAYPAL_PAYMENT_ID') ?></th>
+                                        <th><?= $Lang->get('USER__USERNAME') ?></th>
+                                        <th><?= $Lang->get('SHOP__PAYPAL_OFFER') ?></th>
+                                        <th><?= $Lang->get('SHOP__GLOBAL_AMOUNT') ?></th>
+                                        <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
+                                        <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    </tbody>
+                                </table>
+                                <script type="text/javascript">
+                                    $(document).ready(function () {
+                                        $('#histories_paypal').DataTable({
+                                            "paging": true,
+                                            "lengthChange": false,
+                                            "searching": false,
+                                            "ordering": false,
+                                            "info": false,
+                                            "autoWidth": false,
+                                            'searching': true,
+                                            "bProcessing": true,
+                                            "bServerSide": true,
+                                            "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_paypal_histories')) ?>",
+                                            "aoColumns": [
+                                                {mData: "PaypalHistory.payment_id"},
+                                                {mData: "User.pseudo"},
+                                                {mData: "Paypal.name"},
+                                                {mData: "PaypalHistory.payment_amount"},
+                                                {mData: "PaypalHistory.credits_gived"},
+                                                {mData: "PaypalHistory.created"}
+                                            ],
+                                        });
+                                    });
+                                </script>
+
                             </div>
-                          </td>
-                        </tr>
-                      <?php } ?>
-                    <?php } ?>
-                  </tbody>
-                </table>
-
-                <hr>
-
-                <h3><?= $Lang->get('SHOP__PAYPAL_HISTORIES') ?></h3>
-
-                <table class="table table-bordered dataTable" id="histories_paypal">
-                  <thead>
-                    <tr>
-                      <th><?= $Lang->get('SHOP__PAYPAL_PAYMENT_ID') ?></th>
-                      <th><?= $Lang->get('USER__USERNAME') ?></th>
-                      <th><?= $Lang->get('SHOP__PAYPAL_OFFER') ?></th>
-                      <th><?= $Lang->get('SHOP__GLOBAL_AMOUNT') ?></th>
-                      <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
-                      <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                  </tbody>
-                </table>
-                <script type="text/javascript">
-                $(document).ready(function() {
-                  $('#histories_paypal').DataTable({
-                    "paging": true,
-                    "lengthChange": false,
-                    "searching": false,
-                    "ordering": false,
-                    "info": false,
-                    "autoWidth": false,
-                    'searching': true,
-                    "bProcessing": true,
-                    "bServerSide": true,
-                    "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_paypal_histories')) ?>",
-                    "aoColumns": [
-                        {mData:"PaypalHistory.payment_id"},
-                        {mData:"User.pseudo"},
-                        {mData:"Paypal.name"},
-                        {mData:"PaypalHistory.payment_amount"},
-                        {mData:"PaypalHistory.credits_gived"},
-                        {mData:"PaypalHistory.created"}
-                    ],
-                  });
-                });
-                </script>
-
-              </div>
-
-              <div class="tab-pane" id="tab_psc">
-
-                <h3><?= $Lang->get('SHOP__PAYSAFECARD_ADMIN_TITLE') ?> <a href="<?= $this->Html->url(array('action' => 'toggle_paysafecard')) ?>" class="btn btn-<?= ($paysafecardsStatus) ? 'danger' : 'success' ?> pull-right"><?= ($paysafecardsStatus) ? $Lang->get('GLOBAL__DISABLE') : $Lang->get('GLOBAL__ENABLE') ?></a></h3>
-
-                <br><br>
-
-                <table class="table table-bordered dataTable">
-                  <thead>
-                    <tr>
-                      <th><?= $Lang->get('USER__USERNAME') ?></th>
-                      <th><?= $Lang->get('SHOP__GLOBAL_AMOUNT') ?></th>
-                      <th><?= $Lang->get('SHOP__VOUCHER_CODE') ?></th>
-                      <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
-                      <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <?php if(isset($paysafecards)) { ?>
-                      <?php foreach ($paysafecards as $key => $value) { ?>
-                        <?php if($value['Paysafecard']['user_id'] != "0") { ?>
-                          <tr>
-                            <td><?= $usersByID[$value['Paysafecard']['user_id']] ?></td>
-                            <td><?= $value['Paysafecard']['amount'] ?></td>
-                            <td><?= $value['Paysafecard']['code'] ?></td>
-                            <td><?= $Lang->date($value['Paysafecard']['created']) ?></td>
-                            <td>
-                              <a href="#" onClick="howmuch(<?= $value['Paysafecard']['id'] ?>)" class="btn btn-success"><?= $Lang->get('SHOP__PAYSAFECARD_ACCEPT') ?></a>
-                              <a href="<?= $this->Html->url(array('action' => 'paysafecard_invalid/'.$value['Paysafecard']['id'])) ?>" class="btn btn-danger"><?= $Lang->get('SHOP__PAYSAFECARD_REFUSE') ?></a>
-                            </td>
-                          </tr>
-                        <?php } ?>
-                      <?php } ?>
-                    <?php } ?>
-                  </tbody>
-                </table>
-
-                <script>
-                function howmuch(id) {
-                    var money = prompt("<?= $Lang->get('SHOP__PAYSAFECARD_VALID_CONFIRM') ?>");
-
-                    if (money != null) {
-                        document.location = '<?= $this->Html->url(array('controller' => 'payment', 'action' => 'paysafecard_valid/')) ?>/'+id+'/'+money;
-                    } else {
-                      return false;
-                    }
-                }
-                </script>
-
-
-                <hr>
-
-                <h3><?= $Lang->get('SHOP__PAYSAFECARD_HISTORIES') ?></h3>
-
-                <table class="table table-bordered dataTable" id="histories_paysafecard">
-                  <thead>
-                    <tr>
-                      <th><?= $Lang->get('SHOP__PAYSAFECARD_CODE') ?></th>
-                      <th><?= $Lang->get('USER__USERNAME') ?></th>
-                      <th><?= $Lang->get('SHOP__PAYSAFECARD_VALID_USER') ?></th>
-                      <th><?= $Lang->get('SHOP__GLOBAL_AMOUNT') ?></th>
-                      <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
-                      <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                  </tbody>
-                </table>
-                <script type="text/javascript">
-                $(document).ready(function() {
-                  $('#histories_paysafecard').DataTable({
-                    "paging": true,
-                    "lengthChange": false,
-                    "searching": false,
-                    "ordering": false,
-                    "info": false,
-                    "autoWidth": false,
-                    'searching': true,
-                    "bProcessing": true,
-                    "bServerSide": true,
-                    "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_paysafecard_histories')) ?>",
-                    "aoColumns": [
-                        {mData:"PaysafecardHistory.code"},
-                        {mData:"User.pseudo"},
-                        {mData:"Author.pseudo"},
-                        {mData:"PaysafecardHistory.amount"},
-                        {mData:"PaysafecardHistory.credits_gived"},
-                        {mData:"PaysafecardHistory.created"}
-                    ],
-                  });
-                });
-                </script>
-
-
-              </div>
-
-              <div class="tab-pane" id="tab_dedipass">
-
-                <h3><?= $Lang->get('SHOP__DEDIPASS_CONFIGURATION') ?> <a href="<?= $this->Html->url(array('action' => 'toggle_dedipass')) ?>" class="btn btn-<?= (isset($dedipassConfig['DedipassConfig']['status']) && $dedipassConfig['DedipassConfig']['status']) ? 'danger' : 'success' ?> pull-right"><?= (isset($dedipassConfig['DedipassConfig']['status']) && $dedipassConfig['DedipassConfig']['status']) ? $Lang->get('GLOBAL__DISABLE') : $Lang->get('GLOBAL__ENABLE') ?></a></h3>
-
-                <div class="alert alert-info">
-                  <p>
-                    <?= $Lang->get('SHOP__DEDIPASS_EXPLAIN_CONFIG') ?>
-                  </p>
-                  <p><b><?= $Lang->get('SHOP__DEDIPASS_EXPLAIN_CONFIG_URL_1') ?> :</b> <?= $this->Html->url('/shop/payment/dedipass', true) ?></p>
-                  <p><b><?= $Lang->get('SHOP__DEDIPASS_EXPLAIN_CONFIG_URL_2') ?> :</b> <?= $this->Html->url('/shop/payment/dedipass_ipn', true) ?></p>
-                </div>
 
-                <form action="<?= $this->Html->url(array('action' => 'dedipass_config')) ?>" data-ajax="true">
-
-                  <div class="form-group">
-                    <label><?= $Lang->get('SHOP__DEDIPASS_PUBLICKEY') ?></label>
-                    <input type="text" class="form-control" name="publicKey" placeholder="Ex: 4e2009e88d5c5587302e996de5fe1f47"<?= (isset($dedipassConfig['DedipassConfig']['public_key'])) ? ' value="'.$dedipassConfig['DedipassConfig']['public_key'].'"' : '' ?>>
-                  </div>
-
-                  <div class="form-group">
-                    <button type="submit" class="btn btn-primary"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
-                  </div>
-
-                </form>
-
-                <hr>
-
-                <h3><?= $Lang->get('SHOP__DEDIPASS_HISTORIES') ?></h3>
-
-                <table class="table table-bordered dataTable" id="histories_dedipass">
-                  <thead>
-                    <tr>
-                      <th><?= $Lang->get('SHOP__DEDIPASS_CODE') ?></th>
-                      <th><?= $Lang->get('SHOP__DEDIPASS_RATE') ?></th>
-                      <th><?= $Lang->get('USER__USERNAME') ?></th>
-                      <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
-                      <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                  </tbody>
-                </table>
-                <script type="text/javascript">
-                $(document).ready(function() {
-                  $('#histories_dedipass').DataTable({
-                    "paging": true,
-                    "lengthChange": false,
-                    "searching": false,
-                    "ordering": false,
-                    "info": false,
-                    "autoWidth": false,
-                    'searching': true,
-                    "bProcessing": true,
-                    "bServerSide": true,
-                    "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_dedipass_histories')) ?>",
-                    "aoColumns": [
-                        {mData:"DedipassHistory.code"},
-                        {mData:"DedipassHistory.rate"},
-                        {mData:"User.pseudo"},
-                        {mData:"DedipassHistory.credits_gived"},
-                        {mData:"DedipassHistory.created"}
-                    ],
-                  });
-                });
-                </script>
-
-              </div>
-
-              <div class="tab-pane" id="tab_points_transfer">
-
-                <h3>
-                    <?= $Lang->get('SHOP__USER_POINTS_TRANSFER_HISTORIES', array('{MONEY_NAME}' => $Configuration->getMoneyName())) ?>
-                    <a href="<?= $this->Html->url(array('action' => 'toggle_transfer')) ?>" class="btn btn-<?= ($transferStatus) ? 'danger' : 'success' ?> pull-right"><?= ($transferStatus) ? $Lang->get('GLOBAL__DISABLE') : $Lang->get('GLOBAL__ENABLE') ?></a>
-                </h3>
-
-                <br>
-
-                <table class="table table-bordered dataTable" id="histories_points_transfer">
-                  <thead>
-                  <tr>
-                    <th>Pseudo</th>
-                    <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
-                    <th><?= $Lang->get('SHOP__USER_POINTS_TRANSFER_WHO') ?></th>
-                    <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
-                  </tr>
-                </thead>
-                <tbody>
-                </tbody>
-              </table>
-              <script type="text/javascript">
-              $(document).ready(function() {
-                $('#histories_points_transfer').DataTable({
-                  "paging": true,
-                  "lengthChange": false,
-                  "searching": false,
-                  "ordering": false,
-                  "info": false,
-                  "autoWidth": false,
-                  'searching': true,
-                  "bProcessing": true,
-                  "bServerSide": true,
-                  "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_points_transfer')) ?>",
-                  "aoColumns": [
-                      {mData:"Author.pseudo"},
-                      {mData:"PointsTransferHistory.points"},
-                      {mData:"User.pseudo"},
-                      {mData:"PointsTransferHistory.created"}
-                  ],
-                });
-              });
-              </script>
-              </div>
-            </div>
-          </div>
+                            <div class="tab-pane fade" id="tab_psc">
+
+                                <h3><?= $Lang->get('SHOP__PAYSAFECARD_ADMIN_TITLE') ?> <a
+                                            href="<?= $this->Html->url(array('action' => 'toggle_paysafecard')) ?>"
+                                            class="btn btn-<?= ($paysafecardsStatus) ? 'danger' : 'success' ?> pull-right"><?= ($paysafecardsStatus) ? $Lang->get('GLOBAL__DISABLE') : $Lang->get('GLOBAL__ENABLE') ?></a>
+                                </h3>
+
+                                <br><br>
+
+                                <table class="table table-bordered dataTable">
+                                    <thead>
+                                    <tr>
+                                        <th><?= $Lang->get('USER__USERNAME') ?></th>
+                                        <th><?= $Lang->get('SHOP__GLOBAL_AMOUNT') ?></th>
+                                        <th><?= $Lang->get('SHOP__VOUCHER_CODE') ?></th>
+                                        <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
+                                        <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <?php if (isset($paysafecards)) { ?>
+                                        <?php foreach ($paysafecards as $key => $value) { ?>
+                                            <?php if ($value['Paysafecard']['user_id'] != "0") { ?>
+                                                <tr>
+                                                    <td><?= $usersByID[$value['Paysafecard']['user_id']] ?></td>
+                                                    <td><?= $value['Paysafecard']['amount'] ?></td>
+                                                    <td><?= $value['Paysafecard']['code'] ?></td>
+                                                    <td><?= $Lang->date($value['Paysafecard']['created']) ?></td>
+                                                    <td>
+                                                        <a href="#"
+                                                           onClick="howmuch(<?= $value['Paysafecard']['id'] ?>)"
+                                                           class="btn btn-success"><?= $Lang->get('SHOP__PAYSAFECARD_ACCEPT') ?></a>
+                                                        <a href="<?= $this->Html->url(array('action' => 'paysafecard_invalid/' . $value['Paysafecard']['id'])) ?>"
+                                                           class="btn btn-danger"><?= $Lang->get('SHOP__PAYSAFECARD_REFUSE') ?></a>
+                                                    </td>
+                                                </tr>
+                                            <?php } ?>
+                                        <?php } ?>
+                                    <?php } ?>
+                                    </tbody>
+                                </table>
+
+                                <script>
+                                    function howmuch(id) {
+                                        var money = prompt("<?= $Lang->get('SHOP__PAYSAFECARD_VALID_CONFIRM') ?>");
+
+                                        if (money != null) {
+                                            document.location = '<?= $this->Html->url(array('controller' => 'payment', 'action' => 'paysafecard_valid/')) ?>/' + id + '/' + money;
+                                        } else {
+                                            return false;
+                                        }
+                                    }
+                                </script>
+
+
+                                <hr>
+
+                                <h3><?= $Lang->get('SHOP__PAYSAFECARD_HISTORIES') ?></h3>
+
+                                <table class="table table-bordered dataTable" id="histories_paysafecard">
+                                    <thead>
+                                    <tr>
+                                        <th><?= $Lang->get('SHOP__PAYSAFECARD_CODE') ?></th>
+                                        <th><?= $Lang->get('USER__USERNAME') ?></th>
+                                        <th><?= $Lang->get('SHOP__PAYSAFECARD_VALID_USER') ?></th>
+                                        <th><?= $Lang->get('SHOP__GLOBAL_AMOUNT') ?></th>
+                                        <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
+                                        <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    </tbody>
+                                </table>
+                                <script type="text/javascript">
+                                    $(document).ready(function () {
+                                        $('#histories_paysafecard').DataTable({
+                                            "paging": true,
+                                            "lengthChange": false,
+                                            "searching": false,
+                                            "ordering": false,
+                                            "info": false,
+                                            "autoWidth": false,
+                                            'searching': true,
+                                            "bProcessing": true,
+                                            "bServerSide": true,
+                                            "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_paysafecard_histories')) ?>",
+                                            "aoColumns": [
+                                                {mData: "PaysafecardHistory.code"},
+                                                {mData: "User.pseudo"},
+                                                {mData: "Author.pseudo"},
+                                                {mData: "PaysafecardHistory.amount"},
+                                                {mData: "PaysafecardHistory.credits_gived"},
+                                                {mData: "PaysafecardHistory.created"}
+                                            ],
+                                        });
+                                    });
+                                </script>
 
 
+                            </div>
+
+                            <div class="tab-pane fade" id="tab_dedipass">
+
+                                <h3><?= $Lang->get('SHOP__DEDIPASS_CONFIGURATION') ?> <a
+                                            href="<?= $this->Html->url(array('action' => 'toggle_dedipass')) ?>"
+                                            class="btn btn-<?= (isset($dedipassConfig['DedipassConfig']['status']) && $dedipassConfig['DedipassConfig']['status']) ? 'danger' : 'success' ?> pull-right"><?= (isset($dedipassConfig['DedipassConfig']['status']) && $dedipassConfig['DedipassConfig']['status']) ? $Lang->get('GLOBAL__DISABLE') : $Lang->get('GLOBAL__ENABLE') ?></a>
+                                </h3>
+
+                                <div class="alert alert-info">
+                                    <p>
+                                        <?= $Lang->get('SHOP__DEDIPASS_EXPLAIN_CONFIG') ?>
+                                    </p>
+                                    <p><b><?= $Lang->get('SHOP__DEDIPASS_EXPLAIN_CONFIG_URL_1') ?>
+                                            :</b> <?= $this->Html->url('/shop/payment/dedipass', true) ?></p>
+                                    <p><b><?= $Lang->get('SHOP__DEDIPASS_EXPLAIN_CONFIG_URL_2') ?>
+                                            :</b> <?= $this->Html->url('/shop/payment/dedipass_ipn', true) ?></p>
+                                </div>
+
+                                <form action="<?= $this->Html->url(array('action' => 'dedipass_config')) ?>"
+                                      data-ajax="true">
+
+                                    <div class="form-group">
+                                        <label><?= $Lang->get('SHOP__DEDIPASS_PUBLICKEY') ?></label>
+                                        <input type="text" class="form-control" name="publicKey"
+                                               placeholder="Ex: 4e2009e88d5c5587302e996de5fe1f47"<?= (isset($dedipassConfig['DedipassConfig']['public_key'])) ? ' value="' . $dedipassConfig['DedipassConfig']['public_key'] . '"' : '' ?>>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <button type="submit"
+                                                class="btn btn-primary"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
+                                    </div>
+
+                                </form>
+
+                                <hr>
+
+                                <h3><?= $Lang->get('SHOP__DEDIPASS_HISTORIES') ?></h3>
+
+                                <table class="table table-bordered dataTable" id="histories_dedipass">
+                                    <thead>
+                                    <tr>
+                                        <th><?= $Lang->get('SHOP__DEDIPASS_CODE') ?></th>
+                                        <th><?= $Lang->get('SHOP__DEDIPASS_RATE') ?></th>
+                                        <th><?= $Lang->get('USER__USERNAME') ?></th>
+                                        <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
+                                        <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    </tbody>
+                                </table>
+                                <script type="text/javascript">
+                                    $(document).ready(function () {
+                                        $('#histories_dedipass').DataTable({
+                                            "paging": true,
+                                            "lengthChange": false,
+                                            "searching": false,
+                                            "ordering": false,
+                                            "info": false,
+                                            "autoWidth": false,
+                                            'searching': true,
+                                            "bProcessing": true,
+                                            "bServerSide": true,
+                                            "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_dedipass_histories')) ?>",
+                                            "aoColumns": [
+                                                {mData: "DedipassHistory.code"},
+                                                {mData: "DedipassHistory.rate"},
+                                                {mData: "User.pseudo"},
+                                                {mData: "DedipassHistory.credits_gived"},
+                                                {mData: "DedipassHistory.created"}
+                                            ],
+                                        });
+                                    });
+                                </script>
+
+                            </div>
+
+                            <div class="tab-pane fade" id="tab_points_transfer">
+
+                                <h3>
+                                    <?= $Lang->get('SHOP__USER_POINTS_TRANSFER_HISTORIES', array('{MONEY_NAME}' => $Configuration->getMoneyName())) ?>
+                                    <a href="<?= $this->Html->url(array('action' => 'toggle_transfer')) ?>"
+                                       class="btn btn-<?= ($transferStatus) ? 'danger' : 'success' ?> pull-right"><?= ($transferStatus) ? $Lang->get('GLOBAL__DISABLE') : $Lang->get('GLOBAL__ENABLE') ?></a>
+                                </h3>
+
+                                <br>
+
+                                <table class="table table-bordered dataTable" id="histories_points_transfer">
+                                    <thead>
+                                    <tr>
+                                        <th>Pseudo</th>
+                                        <th><?= ucfirst($Configuration->getMoneyName()) ?></th>
+                                        <th><?= $Lang->get('SHOP__USER_POINTS_TRANSFER_WHO') ?></th>
+                                        <th><?= $Lang->get('GLOBAL__CREATED') ?></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    </tbody>
+                                </table>
+                                <script type="text/javascript">
+                                    $(document).ready(function () {
+                                        $('#histories_points_transfer').DataTable({
+                                            "paging": true,
+                                            "lengthChange": false,
+                                            "searching": false,
+                                            "ordering": false,
+                                            "info": false,
+                                            "autoWidth": false,
+                                            'searching': true,
+                                            "bProcessing": true,
+                                            "bServerSide": true,
+                                            "sAjaxSource": "<?= $this->Html->url(array('action' => 'get_points_transfer')) ?>",
+                                            "aoColumns": [
+                                                {mData: "Author.pseudo"},
+                                                {mData: "PointsTransferHistory.points"},
+                                                {mData: "User.pseudo"},
+                                                {mData: "PointsTransferHistory.created"}
+                                            ],
+                                        });
+                                    });
+                                </script>
+                            </div>
+                        </div>
+                    </div>
+
+
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
 </section>
diff --git a/View/Shop/admin_add_item.ctp b/View/Shop/admin_add_item.ctp
index a7145ca..17e02ad 100755
--- a/View/Shop/admin_add_item.ctp
+++ b/View/Shop/admin_add_item.ctp
@@ -1,11 +1,11 @@
 <section class="content">
     <div class="row">
         <div class="col-md-12">
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title"><?= $Lang->get('SHOP__ITEM_ADD') ?></h3>
+            <div class="card">
+                <div class="card-header with-border">
+                    <h3 class="card-title"><?= $Lang->get('SHOP__ITEM_ADD') ?></h3>
                 </div>
-                <div class="box-body">
+                <div class="card-body">
                     <form action="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'add_item_ajax')) ?>"
                           method="post" data-ajax="true"
                           data-redirect-url="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'index', 'admin' => true)) ?>">
@@ -93,12 +93,11 @@
                                 <label><?= $Lang->get('SHOP__ITEM_DISPLAY_SERVER') ?></label>
                             </div>
                         </div>
-
                         <div class="form-group">
                             <label><?= $Lang->get('GLOBAL__SERVER_COMMANDS') ?></label>
-                            <div class="input-group">
+                            <div class="input-group mb-3">
                                 <input name="commands[0]" class="form-control" type="text">
-                                <div class="input-group-btn">
+                                <div class="input-group-append">
                                     <button data-i="1" type="button" id="addCommand"
                                             class="btn btn-success"><?= $Lang->get('SHOP__ITEM_ADD_COMMAND') ?></button>
                                 </div>
@@ -294,10 +293,10 @@
         var i = parseInt($(this).attr('data-i'));
 
         var input = '';
-        input += '<div style="margin-top:5px;" class="input-group" id="' + i + '">';
+        input += '<div style="margin-top:5px;" class="input-group mb-3" id="' + i + '">';
         input += '<input name="commands[' + i + ']" class="form-control" type="text">';
-        input += '<span class="input-group-btn">';
-        input += '<button class="btn btn-danger delete-cmd" data-id="' + i + '" type="button"><span class="fa fa-close"></span></button>';
+        input += '<span class="input-group-append">';
+        input += '<button class="btn btn-danger delete-cmd" data-id="' + i + '" type="button"><span class="fas fa-times"></span></button>';
         input += '</span>';
         input + '</div>';
 
diff --git a/View/Shop/admin_add_voucher.ctp b/View/Shop/admin_add_voucher.ctp
index 3382b0b..70335b0 100755
--- a/View/Shop/admin_add_voucher.ctp
+++ b/View/Shop/admin_add_voucher.ctp
@@ -1,11 +1,11 @@
 <section class="content">
     <div class="row">
         <div class="col-md-12">
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title"><?= $Lang->get('SHOP__VOUCHER_ADD') ?></h3>
+            <div class="card">
+                <div class="card-header with-border">
+                    <h3 class="card-title"><?= $Lang->get('SHOP__VOUCHER_ADD') ?></h3>
                 </div>
-                <div class="box-body">
+                <div class="card-body">
 
                     <form action="<?= $this->Html->url(array('action' => 'add_voucher_ajax', 'admin' => true)) ?>"
                           method="post" data-ajax="true"
@@ -15,13 +15,13 @@
 
                         <div class="form-group">
                             <label><?= $Lang->get('SHOP__VOUCHER_CODE') ?></label>
-                            <div class="input-group">
+                            <div class="input-group mb-3">
                                 <input name="code" id="random" class="form-control"
                                        placeholder="<?= $Lang->get('SHOP__VOUCHER_CODE') ?>" type="text">
-                                <span class="input-group-btn">
-                  <button class="btn btn-info" type="button"
-                          onClick="$('#random').val(random_code(10))"><?= $Lang->get('SHOP__VOUCHER_GENERATE') ?></button>
-                </span>
+                                <div class="input-group-append">
+                                    <button class="btn btn-info" type="button"
+                                            onClick="$('#random').val(random_code(10))"><?= $Lang->get('SHOP__VOUCHER_GENERATE') ?></button>
+                                </div>
                             </div>
                         </div>
 
@@ -80,29 +80,38 @@
 
                         <div class="form-group">
                             <label><?= $Lang->get('SHOP__VOUCHER_START_DATE') ?></label>
-                            <div class="input-group">
-                                <div class="input-group-addon">
-                                    <i class="fa fa-calendar"></i>
+                            <div class="input-group mb-3">
+
+                                <div class="input-group-prepend" data-target="#datetimepicker"
+                                     data-toggle="datetimepicker">
+                                    <span class="input-group-text"><i class="fa fa-calendar"></i></span>
                                 </div>
-                                <input value="<?= date('Y-m-d H:i:s') ?>" type="text" class="form-control"
+                                <input value="<?= date('Y-m-d H:i:s') ?>" data-target="#datetimepicker"
+                                       data-toggle="datetimepicker" type="text" class="form-control"
                                        name="start_date" id="datetimepicker"
                                        placeholder="<?= 'Format : ' . $Lang->get('GLOBAL__DATE_YEAR') . '-' . $Lang->get('GLOBAL__DATE_MONTH') . '-' . $Lang->get('GLOBAL__DATE_DAY') . ' ' . $Lang->get('GLOBAL__DATE_HOUR') . ':' . $Lang->get('GLOBAL__DATE_MINUTES') . ':' . $Lang->get('GLOBAL__DATE_SECONDS') ?>">
                             </div>
-                            <small class="text-info"><em><?= $Lang->get('SHOP__VOUCHER_START_DATE_EXPLAIN') ?></em>
+                            <small class="text-info">
+                                <em><?= $Lang->get('SHOP__VOUCHER_START_DATE_EXPLAIN') ?></em>
                             </small>
                         </div>
 
+
                         <div class="form-group">
                             <label><?= $Lang->get('SHOP__VOUCHER_END_DATE') ?></label>
-                            <div class="input-group">
-                                <div class="input-group-addon">
-                                    <i class="fa fa-calendar"></i>
+                            <div class="input-group mb-3">
+
+                                <div class="input-group-prepend" data-target="#datetimepicker2"
+                                     data-toggle="datetimepicker">
+                                    <span class="input-group-text"><i class="fa fa-calendar"></i></span>
                                 </div>
-                                <input type="text" class="form-control" name="end_date" id="datetimepicker2"
+                                <input type="text" data-target="#datetimepicker2" data-toggle="datetimepicker"
+                                       class="form-control" name="end_date" id="datetimepicker2"
                                        placeholder="<?= 'Format : ' . $Lang->get('GLOBAL__DATE_YEAR') . '-' . $Lang->get('GLOBAL__DATE_MONTH') . '-' . $Lang->get('GLOBAL__DATE_DAY') . ' ' . $Lang->get('GLOBAL__DATE_HOUR') . ':' . $Lang->get('GLOBAL__DATE_MINUTES') . ':' . $Lang->get('GLOBAL__DATE_SECONDS') ?>">
                             </div>
                         </div>
 
+
                         <div class="form-group">
                             <label><?= $Lang->get('SHOP__VOUCHER_LIMIT_TYPE') ?></label>
                             <select class="form-control" name="limit_type">
@@ -113,7 +122,8 @@
 
                         <div class="form-group">
                             <label><?= $Lang->get('SHOP__VOUCHER_LIMIT') ?></label>
-                            <input type="text" class="form-control" name="limit" placeholder="<?= $Lang->get('SHOP__VOUCHER_LIMIT_DESC') ?>">
+                            <input type="text" class="form-control" name="limit"
+                                   placeholder="<?= $Lang->get('SHOP__VOUCHER_LIMIT_DESC') ?>">
                         </div>
 
                         <div class="form-group">
@@ -174,9 +184,7 @@
         return Chaine;
     }
 </script>
-<?= $this->Html->script('moment') ?>
-<?= $this->Html->script('bootstrap-datetimepicker') ?>
-<?= $this->Html->css('bootstrap-datetimepicker') ?>
+
 <script type="text/javascript">
     $(function () {
         $('#datetimepicker').datetimepicker({
diff --git a/View/Shop/admin_edit.ctp b/View/Shop/admin_edit.ctp
index dba1c4b..eccca56 100755
--- a/View/Shop/admin_edit.ctp
+++ b/View/Shop/admin_edit.ctp
@@ -1,11 +1,11 @@
 <section class="content">
     <div class="row">
         <div class="col-md-12">
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title"><?= $Lang->get('SHOP__ITEM_EDIT') ?></h3>
+            <div class="card">
+                <div class="card-header with-border">
+                    <h3 class="card-title"><?= $Lang->get('SHOP__ITEM_EDIT') ?></h3>
                 </div>
-                <div class="box-body">
+                <div class="card-body">
                     <form action="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'edit_ajax')) ?>"
                           method="post" data-ajax="true"
                           data-redirect-url="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'index', 'admin' => true)) ?>">
@@ -28,9 +28,9 @@
                             <script type="text/javascript">
                                 tinymce.init({
                                     selector: "textarea",
-                                    height : 300,
-                                    width : '100%',
-                                    language : 'fr_FR',
+                                    height: 300,
+                                    width: '100%',
+                                    language: 'fr_FR',
                                     plugins: "textcolor code image link",
                                     toolbar: "fontselect fontsizeselect bold italic underline strikethrough link image forecolor backcolor alignleft aligncenter alignright alignjustify cut copy paste bullist numlist outdent indent blockquote code"
                                 });
@@ -102,24 +102,25 @@
 
                         <div class="form-group">
                             <label><?= $Lang->get('GLOBAL__SERVER_COMMANDS') ?></label>
-                            <div class="input-group">
+                            <div class="input-group mb-3">
                                 <input name="commands[0]" class="form-control"
                                        value="<?= htmlentities($item['commands'][0]) ?>" type="text">
-                                <div class="input-group-btn">
+                                <div class="input-group-append">
                                     <button data-i="<?= count($item['commands']) ?>" type="button" id="addCommand"
                                             class="btn btn-success"><?= $Lang->get('SHOP__ITEM_ADD_COMMAND') ?></button>
                                 </div>
                             </div>
+
                             <div class="addCommand">
                                 <?php
                                 $i = 0;
                                 unset($item['commands'][0]);
                                 foreach ($item['commands'] as $key => $value) {
                                     $i++;
-                                    echo '<div class="input-group" style="margin-top:5px;" id="' . $i . '">';
+                                    echo '<div class="input-group mb-3" style="margin-top:5px;" id="' . $i . '">';
                                     echo '<input name="commands[' . $i . ']" class="form-control" value="' . htmlentities($value) . '" type="text">';
-                                    echo '<span class="input-group-btn">';
-                                    echo '<button class="btn btn-danger delete-cmd" data-id="' . $i . '" type="button"><span class="fa fa-close"></span></button>';
+                                    echo '<span class="input-group-append">';
+                                    echo '<button class="btn btn-danger delete-cmd" data-id="' . $i . '" type="button"><span class="fas fa-times"></span></button>';
                                     echo '</span>';
                                     echo '</div>';
                                 }
@@ -333,10 +334,10 @@
         var i = parseInt($(this).attr('data-i'));
 
         var input = '';
-        input += '<div style="margin-top:5px;" class="input-group" id="' + i + '">';
+        input += '<div style="margin-top:5px;" class="input-group mb-3" id="' + i + '">';
         input += '<input name="commands[' + i + ']" class="form-control" type="text">';
-        input += '<span class="input-group-btn">';
-        input += '<button class="btn btn-danger delete-cmd" data-id="' + i + '" type="button"><span class="fa fa-close"></span></button>';
+        input += '<span class="input-group-append">';
+        input += '<button class="btn btn-danger delete-cmd" data-id="' + i + '" type="button"><span class="fas fa-times"></span></button>';
         input += '</span>';
         input + '</div>';
 
diff --git a/View/Shop/admin_index.ctp b/View/Shop/admin_index.ctp
index 3fea11f..4b164dc 100755
--- a/View/Shop/admin_index.ctp
+++ b/View/Shop/admin_index.ctp
@@ -1,11 +1,12 @@
 <section class="content">
     <div class="row">
         <div class="col-md-6">
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title"><?= $Lang->get('SHOP__CONFIG') ?></h3>
+            <div class="card">
+                <div class="card-header with-border">
+                    <h3 class="card-title"><?= $Lang->get('SHOP__CONFIG') ?></h3>
                 </div>
-                <div class="box-body">
+
+                <div class="card-body">
                     <form action="<?= $this->Html->url(array('action' => 'config_items')) ?>" method="post"
                           data-ajax="true">
 
@@ -21,14 +22,6 @@
                                    type="text"<?= (isset($config['goal'])) ? ' value="' . $config['goal'] . '"' : '' ?>>
                         </div>
 
-                        <!--<div class="form-group">
-              <div class="checkbox">
-                <input name="disabled-sort_by_server" type="checkbox"<?= (isset($config['sort_by_server']) && $config['sort_by_server']) ? ' checked=""' : '' ?> disabled>
-                <label><?= $Lang->get('SHOP__CONFIG_SORT_BY_SERVER') ?></label>
-              </div>
-              <small><?= $Lang->get('GLOBAL__TEMPORALY_DISABLED') ?></small>
-            </div>-->
-
                         <div class="form-group">
                             <button class="btn btn-primary" type="submit"><?= $Lang->get('GLOBAL__SUBMIT') ?></button>
                         </div>
@@ -38,11 +31,11 @@
             </div>
         </div>
         <div class="col-md-6">
-            <div class="box">
-                <div class="box-header">
-                    <h3 class="box-title"><?= $Lang->get('SHOP__CONFIG_EXPLAIN_TITLE') ?></h3>
+            <div class="card">
+                <div class="card-header">
+                    <h3 class="card-title"><?= $Lang->get('SHOP__CONFIG_EXPLAIN_TITLE') ?></h3>
                 </div>
-                <div class="box-body">
+                <div class="card-body">
                     <blockquote>
                         <p><?= $Lang->get('SHOP__CONFIG_EXPLAIN') ?></p>
                     </blockquote>
@@ -57,152 +50,169 @@
     </div>
     <div class="row">
         <div class="col-md-12">
-            <div class="nav-tabs-custom">
-                <ul class="nav nav-tabs">
-                    <li class="active"><a href="#category_other" data-toggle="tab"
-                                          aria-expanded="true"><?= $Lang->get('SHOP__ITEMS_AVAILABLE_OTHER') ?></a></li>
-                    <?php if (!empty($search_sections)) foreach ($search_sections as $value) { ?>
-                        <li class="dropdown">
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#" aria-expanded="false">
-                                <?= $value['Section']['name'] ?> <span class="caret"></span>
-                            </a>
-                            <ul class="dropdown-menu">
-                                <?php if (!empty($search_categories)) foreach ($search_categories["section-id-" . $value['Section']['id']] as $v) { ?>
-                                    <li class=""><a href="#category_<?= $v['Category']['id'] ?>" data-toggle="tab"
-                                                    aria-expanded="false"><?= $v['Category']['name'] ?></a></li>
-                                <?php } ?>
-                            </ul>
-                        </li>
-                    <?php } ?>
-                    <?php if (!empty($search_categories_without_section)) foreach ($search_categories_without_section as $value) {
-                        $i++; ?>
-                        <li><a href="#category_<?= $value['Category']['id'] ?>" data-toggle="tab"
-                               aria-expanded="true"><?= $value['Category']['name'] ?></a></li>
-                    <?php } ?>
-                </ul>
-                <div class="tab-content">
-                    <div class="tab-pane active" id="category_other">
-                        <table class="table table-bordered">
-                            <thead>
-                            <tr>
-                                <th><?= $Lang->get('SHOP__ITEMS_AVAILABLE') ?></th>
-                                <th><?= $Lang->get('SERVER__TITLE') ?></th>
-                                <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
-                                <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            <?php if (!empty($search_items_other)) foreach ($search_items_other as $val => $va) { ?>
-                                <tr>
-                                    <td><?= $va["Item"]["name"] ?></td>
-                                    <td><?= $item_server[$va['Item']['id']] ?></td>
-                                    <td><?= $va["Item"]["price"] ?> <?= $Configuration->getMoneyName() ?></td>
-                                    <td class="right">
-                                        <a onClick="confirmDuplicate('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'duplicate/' . $va["Item"]["id"], 'admin' => true)) ?>')"
-                                           class="btn bg-olive"><?= $Lang->get('SHOP__DUPLICATE') ?></a>
-                                        <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'edit/' . $va["Item"]["id"], 'admin' => true)) ?>"
-                                           class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
-                                        <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/item/' . $va["Item"]["id"], 'admin' => true)) ?>')"
-                                           class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
-                                    </td>
-                                </tr>
+            <div class="card">
+                <div class="card-header with-border">
+                    <h3 class="card-title"><?= $Lang->get("SHOP__MENU_ITEMS") ?></h3>
+                </div>
+                <div class="card-body">
+
+
+                    <div class="nav-tabs-custom">
+                        <ul class="nav nav-tabs">
+                            <li class="nav-item active">
+                                <a class="nav-link text-dark active" href="#category_other"
+                                   data-toggle="pill" role="tab"
+                                   aria-selected="true"><?= $Lang->get('SHOP__ITEMS_AVAILABLE_OTHER') ?></a>
+                            </li>
+                            <?php if (!empty($search_sections)) foreach ($search_sections as $value) { ?>
+                                <li class="nav-item dropdown">
+                                    <a class="nav-link text-dark dropdown-toggle" data-toggle="dropdown" href="#"
+                                       aria-expanded="false">
+                                        <?= $value['Section']['name'] ?> <span class="caret"></span>
+                                    </a>
+                                    <ul class="dropdown-menu">
+                                        <?php if (!empty($search_categories)) foreach ($search_categories["section-id-" . $value['Section']['id']] as $v) { ?>
+                                            <li class="dropdown-item"><a class="text-dark"
+                                                                         href="#category_<?= $v['Category']['id'] ?>"
+                                                                         data-toggle="pill" role="tab"
+                                                                         aria-selected="false"><?= $v['Category']['name'] ?></a>
+                                            </li>
+                                        <?php } ?>
+                                    </ul>
+                                </li>
                             <?php } ?>
-                            </tbody>
-                        </table>
-                    </div>
-                    <?php if (!empty($search_categories)) foreach ($search_categories as $v) { ?>
-                        <div class="tab-pane" id="category_<?= $v['Category']['id'] ?>">
-                            <table class="table table-bordered">
-                                <thead>
-                                <tr>
-                                    <th><?= $Lang->get('SHOP__ITEMS_AVAILABLE') ?>
-                                        &nbsp;&nbsp;
-                                        <a style="display:inline"
-                                           href="<?php if (!empty($search_categories)) { ?><?= $this->Html->url(array('controller' => 'shop', 'action' => 'add_item/' . $v['Category']['id'], 'admin' => true)) ?><?php } ?>"
-                                           class="btn btn-sm btn-success
-                                           <?php if (empty($search_categories)) {
-                                               echo ' disabled';
-                                           } ?>">
-                                            <?= $Lang->get('GLOBAL__ADD') ?>
-                                        </a>
-                                    </th>
-                                    <th><?= $Lang->get('SERVER__TITLE') ?></th>
-                                    <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
-                                    <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
-                                </tr>
-                                </thead>
-                                <tbody id="sortable-<?= $v['Category']['id'] ?>">
-                                <?php $i = 0;
-                                if (!empty($search_items)) foreach ($search_items[$v['Category']['id']] as $va) { ?>
-                                    <tr class="item" style="cursor:move;" id="<?= $va["Item"]["id"] ?>-<?= $i ?>">
-                                        <td><?= $va["Item"]["name"] ?></td>
-                                        <td><?= $item_server[$va['Item']['id']] ?></td>
-                                        <td><?= $va["Item"]["price"] ?> <?= $Configuration->getMoneyName() ?></td>
-                                        <td class="right">
-                                            <a onClick="confirmDuplicate('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'duplicate/' . $va["Item"]["id"], 'admin' => true)) ?>')"
-                                               class="btn bg-olive"><?= $Lang->get('SHOP__DUPLICATE') ?></a>
-                                            <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'edit/' . $va["Item"]["id"], 'admin' => true)) ?>"
-                                               class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
-                                            <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/item/' . $va["Item"]["id"], 'admin' => true)) ?>')"
-                                               class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
-                                        </td>
+                            <?php if (!empty($search_categories_without_section)) foreach ($search_categories_without_section as $value) { ?>
+                                <li class="nav-item"><a class="nav-link text-dark"
+                                                        href="#category_<?= $value['Category']['id'] ?>"
+                                                        data-toggle="pill" role="tab"
+                                                        aria-selected="false"><?= $value['Category']['name'] ?></a></li>
+                            <?php } ?>
+                        </ul>
+                        <div class="tab-content">
+                            <div class="tab-pane fade show active" id="category_other">
+                                <table class="table table-bordered">
+                                    <thead>
+                                    <tr>
+                                        <th><?= $Lang->get('SHOP__ITEMS_AVAILABLE') ?></th>
+                                        <th><?= $Lang->get('SERVER__TITLE') ?></th>
+                                        <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
+                                        <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
                                     </tr>
-                                    <?php $i++;
-                                } ?>
-                                </tbody>
-                            </table>
-                            <div class="ajax-msg"></div>
-                            <button id="save" class="btn btn-success pull-right active"
-                                    disabled="disabled"><?= $Lang->get('SHOP__SAVE_SUCCESS') ?></button>
-                            <br><br>
-                        </div>
-                        <script type="text/javascript">
-                            function confirmDuplicate(url) {
-                                if (confirm("<?= $Lang->get('SHOP__CONFIRM_DUPLICATE') ?>"))
-                                    window.location.href = '' + url + '';
-                                else
-                                    return false;
-                            }
-                        </script>
-                    <?php } ?>
-                    <script>
-                        $(function () {
-                            $("<?= implode(', ', array_map(function ($category) {
-                                return "#sortable-" . $category['Category']['id'];
-                            }, $search_categories)); ?>").sortable({
-                                axis: 'y',
-                                items: '.item:not(.fixed)',
-                                stop: function (event, ui) {
-                                    $('#save').empty().html('<?= $Lang->get('SHOP__SAVE_IN_PROGRESS') ?>');
-                                    var inputs = {};
-                                    var shop_item_order = $(this).sortable('serialize');
-                                    inputs['shop_item_order'] = shop_item_order;
-                                    $('#shop_item_order').text(shop_item_order);
-                                    inputs['data[_Token][key]'] = '<?= $csrfToken ?>';
-                                    $.post("<?= $this->Html->url(array('controller' => 'shop', 'action' => 'save_ajax', 'admin' => true)) ?>", inputs, function (data) {
-                                        if (data.statut) {
-                                            $('#save').empty().html('<?= $Lang->get('SHOP__SAVE_SUCCESS') ?>');
-                                        } else if (!data.statut) {
-                                            $('.ajax-msg').empty().html('<div class="alert alert-danger" style="margin-top:10px;margin-right:10px;margin-left:10px;"><a class="close" data-dismiss="alert">×</a><i class="icon icon-warning-sign"></i> <b><?= $Lang->get('GLOBAL__ERROR') ?> :</b> ' + data.msg + '</i></div>').fadeIn(500);
-                                        } else {
-                                            $('.ajax-msg').empty().html('<div class="alert alert-danger" style="margin-top:10px;margin-right:10px;margin-left:10px;"><a class="close" data-dismiss="alert">×</a><i class="icon icon-warning-sign"></i> <b><?= $Lang->get('GLOBAL__ERROR') ?> :</b> <?= $Lang->get('ERROR__INTERNAL_ERROR') ?></i></div>');
+                                    </thead>
+                                    <tbody>
+                                    <?php if (!empty($search_items_other)) foreach ($search_items_other as $val => $va) { ?>
+                                        <tr>
+                                            <td><?= $va["Item"]["name"] ?></td>
+                                            <td><?= $item_server[$va['Item']['id']] ?></td>
+                                            <td><?= $va["Item"]["price"] ?> <?= $Configuration->getMoneyName() ?></td>
+                                            <td class="right">
+                                                <a onClick="confirmDuplicate('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'duplicate/' . $va["Item"]["id"], 'admin' => true)) ?>')"
+                                                   class="btn bg-olive"><?= $Lang->get('SHOP__DUPLICATE') ?></a>
+                                                <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'edit/' . $va["Item"]["id"], 'admin' => true)) ?>"
+                                                   class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
+                                                <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/item/' . $va["Item"]["id"], 'admin' => true)) ?>')"
+                                                   class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+                                            </td>
+                                        </tr>
+                                    <?php } ?>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <?php if (!empty($search_categories)) foreach ($search_categories as $v) { ?>
+                                <div class="tab-pane fade" id="category_<?= $v['Category']['id'] ?>">
+                                    <table class="table table-bordered">
+                                        <thead>
+                                        <tr>
+                                            <th><?= $Lang->get('SHOP__ITEMS_AVAILABLE') ?>
+                                                &nbsp;&nbsp;
+                                                <a style="display:inline"
+                                                   href="<?php if (!empty($search_categories)) { ?><?= $this->Html->url(array('controller' => 'shop', 'action' => 'add_item/' . $v['Category']['id'], 'admin' => true)) ?><?php } ?>"
+                                                   class="btn btn-sm btn-success
+                                           <?php if (empty($search_categories)) {
+                                                       echo ' disabled';
+                                                   } ?>">
+                                                    <?= $Lang->get('GLOBAL__ADD') ?>
+                                                </a>
+                                            </th>
+                                            <th><?= $Lang->get('SERVER__TITLE') ?></th>
+                                            <th><?= $Lang->get('SHOP__ITEM_PRICE') ?></th>
+                                            <th class="right"><?= $Lang->get('GLOBAL__ACTIONS') ?></th>
+                                        </tr>
+                                        </thead>
+                                        <tbody id="sortable-<?= $v['Category']['id'] ?>">
+                                        <?php $i = 0;
+                                        if (!empty($search_items)) foreach ($search_items[$v['Category']['id']] as $va) { ?>
+                                            <tr class="item" style="cursor:move;"
+                                                id="<?= $va["Item"]["id"] ?>-<?= $i ?>">
+                                                <td><?= $va["Item"]["name"] ?></td>
+                                                <td><?= $item_server[$va['Item']['id']] ?></td>
+                                                <td><?= $va["Item"]["price"] ?> <?= $Configuration->getMoneyName() ?></td>
+                                                <td class="right">
+                                                    <a onClick="confirmDuplicate('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'duplicate/' . $va["Item"]["id"], 'admin' => true)) ?>')"
+                                                       class="btn bg-olive"><?= $Lang->get('SHOP__DUPLICATE') ?></a>
+                                                    <a href="<?= $this->Html->url(array('controller' => 'shop', 'action' => 'edit/' . $va["Item"]["id"], 'admin' => true)) ?>"
+                                                       class="btn btn-info"><?= $Lang->get('GLOBAL__EDIT') ?></a>
+                                                    <a onClick="confirmDel('<?= $this->Html->url(array('controller' => 'shop', 'action' => 'delete/item/' . $va["Item"]["id"], 'admin' => true)) ?>')"
+                                                       class="btn btn-danger"><?= $Lang->get('GLOBAL__DELETE') ?></a>
+                                                </td>
+                                            </tr>
+                                            <?php $i++;
+                                        } ?>
+                                        </tbody>
+                                    </table>
+                                    <div class="ajax-msg"></div>
+                                    <button id="save" class="btn btn-success pull-right active"
+                                            disabled="disabled"><?= $Lang->get('SHOP__SAVE_SUCCESS') ?></button>
+                                    <br><br>
+                                </div>
+                                <script type="text/javascript">
+                                    function confirmDuplicate(url) {
+                                        if (confirm("<?= $Lang->get('SHOP__CONFIRM_DUPLICATE') ?>"))
+                                            window.location.href = '' + url + '';
+                                        else
+                                            return false;
+                                    }
+                                </script>
+                            <?php } ?>
+                            <script>
+                                $(function () {
+                                    $("<?= implode(', ', array_map(function ($category) {
+                                        return "#sortable-" . $category['Category']['id'];
+                                    }, $search_categories)); ?>").sortable({
+                                        axis: 'y',
+                                        items: '.item:not(.fixed)',
+                                        stop: function (event, ui) {
+                                            $('#save').empty().html('<?= $Lang->get('SHOP__SAVE_IN_PROGRESS') ?>');
+                                            var inputs = {};
+                                            var shop_item_order = $(this).sortable('serialize');
+                                            inputs['shop_item_order'] = shop_item_order;
+                                            $('#shop_item_order').text(shop_item_order);
+                                            inputs['data[_Token][key]'] = '<?= $csrfToken ?>';
+                                            $.post("<?= $this->Html->url(array('controller' => 'shop', 'action' => 'save_ajax', 'admin' => true)) ?>", inputs, function (data) {
+                                                if (data.statut) {
+                                                    $('#save').empty().html('<?= $Lang->get('SHOP__SAVE_SUCCESS') ?>');
+                                                } else if (!data.statut) {
+                                                    $('.ajax-msg').empty().html('<div class="alert alert-danger" style="margin-top:10px;margin-right:10px;margin-left:10px;"><a class="close" data-dismiss="alert">×</a><i class="icon icon-warning-sign"></i> <b><?= $Lang->get('GLOBAL__ERROR') ?> :</b> ' + data.msg + '</i></div>').fadeIn(500);
+                                                } else {
+                                                    $('.ajax-msg').empty().html('<div class="alert alert-danger" style="margin-top:10px;margin-right:10px;margin-left:10px;"><a class="close" data-dismiss="alert">×</a><i class="icon icon-warning-sign"></i> <b><?= $Lang->get('GLOBAL__ERROR') ?> :</b> <?= $Lang->get('ERROR__INTERNAL_ERROR') ?></i></div>');
+                                                }
+                                            });
                                         }
                                     });
-                                }
-                            });
-                        });
-                    </script>
+                                });
+                            </script>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-    <div class="row">
+
         <div class="col-md-12">
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title"><?= $Lang->get('SHOP__HISTORY_PURCHASES') ?></h3>
+            <div class="card">
+                <div class="card-header with-border">
+                    <h3 class="card-title"><?= $Lang->get('SHOP__HISTORY_PURCHASES') ?></h3>
                 </div>
-                <div class="box-body">
+                <div class="card-body">
 
                     <table class="table table-bordered dataTable" id="histories_buy">
                         <thead>
@@ -220,7 +230,7 @@
                 </div>
             </div>
         </div>
-    </div>
+
     </div>
 </section>
 <script type="text/javascript">
diff --git a/View/Shop/admin_vouchers.ctp b/View/Shop/admin_vouchers.ctp
index 0480f22..075cecc 100755
--- a/View/Shop/admin_vouchers.ctp
+++ b/View/Shop/admin_vouchers.ctp
@@ -5,11 +5,11 @@ $this->DiscountVoucher = new DiscountVoucherComponent;
 <section class="content">
     <div class="row">
       <div class="col-md-12">
-        <div class="box">
-          <div class="box-header with-border">
-            <h3 class="box-title"><?= $Lang->get('SHOP__VOUCHERS_MANAGE') ?> &nbsp;&nbsp;<a class="btn btn-success" href="<?= $this->Html->url(array('action' => 'add_voucher')) ?>"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
+        <div class="card">
+          <div class="card-header with-border">
+            <h3 class="card-title"><?= $Lang->get('SHOP__VOUCHERS_MANAGE') ?> &nbsp;&nbsp;<a class="btn btn-success" href="<?= $this->Html->url(array('action' => 'add_voucher')) ?>"><?= $Lang->get('GLOBAL__ADD') ?></a></h3>
           </div>
-          <div class="box-body">
+          <div class="card-body">
 
             <table class="table table-bordered">
               <thead>
@@ -54,11 +54,11 @@ $this->DiscountVoucher = new DiscountVoucherComponent;
     </div>
     <div class="row">
       <div class="col-md-12">
-        <div class="box">
-          <div class="box-header with-border">
-            <h3 class="box-title"><?= $Lang->get('SHOP__VOUCHERS_HISTORIES') ?></h3>
+        <div class="card">
+          <div class="card-header with-border">
+            <h3 class="card-title"><?= $Lang->get('SHOP__VOUCHERS_HISTORIES') ?></h3>
           </div>
-          <div class="box-body">
+          <div class="card-body">
 
             <table class="table table-bordered dataTable">
               <thead>
diff --git a/config.json b/config.json
index 0d0dce8..9c9c68b 100755
--- a/config.json
+++ b/config.json
@@ -37,7 +37,7 @@
 		"Boutique": "/shop"
 	},
 	"author":"Eywek",
-	"version":"1.3.0",
+	"version":"1.3.1",
 	"useEvents":true,
 	"permissions" : {
 		"available" : ["CREDIT_ACCOUNT", "CAN_BUY", "SHOP__ADMIN_MANAGE_ITEMS", "SHOP__ADMIN_MANAGE_CATEGORIES", "SHOP__ADMIN_MANAGE_VOUCHERS", "SHOP__ADMIN_MANAGE_PAYMENT", "SHOP__ADMIN_GIFTALL"],
@@ -47,6 +47,6 @@
 		}
 	},
 	"requirements" : {
-		"CMS" : "^1.9.0"
+		"CMS" : "^1.11.0"
 	}
 }

From c9a8d04f0e4f66da68cef22d97357b099395b1e4 Mon Sep 17 00:00:00 2001
From: nivcoo <36514752+nivcoo@users.noreply.github.com>
Date: Thu, 24 Dec 2020 17:45:05 +0100
Subject: [PATCH 40/45] improv. fix wrong condition (#63)

---
 Controller/CategoriesController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Controller/CategoriesController.php b/Controller/CategoriesController.php
index dc23756..0935ffa 100644
--- a/Controller/CategoriesController.php
+++ b/Controller/CategoriesController.php
@@ -59,7 +59,7 @@ public function admin_edit($id = false)
             $this->set(compact('category', 'search_sections'));
 
             if ($this->request->is('post')) {
-                $section = $this->request->data['section'] || !empty($this->request->data['section_id']);
+                $section = !$this->request->data['section'] || !empty($this->request->data['section_id']);
                 if (!empty($this->request->data['name']) AND $section) {
 
                     if (!$this->request->data['section']) $this->request->data['section_id'] = 0;
@@ -175,7 +175,7 @@ public function admin_add_category($section_id = null)
             $this->set(compact('search_sections', 'section_id'));
 
             if ($this->request->is('post')) {
-                $section = $this->request->data['section'] || !empty($this->request->data['section_id']);
+                $section = !$this->request->data['section'] || !empty($this->request->data['section_id']);
                 if (!empty($this->request->data['name']) AND $section) {
 
                     $this->loadModel('Shop.Category');

From 9e699ea3564d955af9abfe6d4576ce799da6d248 Mon Sep 17 00:00:00 2001
From: Valentin T <Eywek@users.noreply.github.com>
Date: Thu, 24 Dec 2020 17:45:23 +0100
Subject: [PATCH 41/45] Update config.json

---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.json b/config.json
index 9c9c68b..37b5d11 100755
--- a/config.json
+++ b/config.json
@@ -37,7 +37,7 @@
 		"Boutique": "/shop"
 	},
 	"author":"Eywek",
-	"version":"1.3.1",
+	"version":"1.3.2",
 	"useEvents":true,
 	"permissions" : {
 		"available" : ["CREDIT_ACCOUNT", "CAN_BUY", "SHOP__ADMIN_MANAGE_ITEMS", "SHOP__ADMIN_MANAGE_CATEGORIES", "SHOP__ADMIN_MANAGE_VOUCHERS", "SHOP__ADMIN_MANAGE_PAYMENT", "SHOP__ADMIN_GIFTALL"],

From d40ffe97e96fe4dfd115c51518bf630ebc5418dc Mon Sep 17 00:00:00 2001
From: AlexRahvalov <46575437+AlexRahvalov@users.noreply.github.com>
Date: Sat, 28 Aug 2021 19:52:31 +0300
Subject: [PATCH 42/45] Added translation of missing remarks (#66)

---
 lang/ru_RU.json | 519 +++++++++++++++++++++++++-----------------------
 1 file changed, 268 insertions(+), 251 deletions(-)

diff --git a/lang/ru_RU.json b/lang/ru_RU.json
index 2d84f11..a0be1d8 100644
--- a/lang/ru_RU.json
+++ b/lang/ru_RU.json
@@ -1,270 +1,287 @@
 {
-   "SHOP__TITLE": "Магазин",
-       "SHOP__GLOBAL_AMOUNT": "Сумма",
+	"SHOP__TITLE": "Магазин",
+	"SHOP__GLOBAL_AMOUNT": "Сумма",
 
-       "SHOP__CONFIG": "Конфигурация",
-       "SHOP__SAVE_SUCCESS": "Сохранено!",
-       "SHOP__SAVE_IN_PROGRESS": "Автоматическое резервное копирование ...",
-       "SHOP__CONFIG_GOAL_TITLE": "Цель месяца",
-       "SHOP__CONFIG_GOAL_DESC": "Оставьте пустым, чтобы удалить",
-       "SHOP__CONFIG_SORT_BY_SERVER": "Сортировать статьи и категории по серверу",
-       "SHOP__CONFIG_BROADCAST_GLOBAL": "Глобальный заказ, сделанный с каждой покупкой",
-       "SHOP__CONFIG_EXPLAIN_TITLE": "Обоснование",
-       "SHOP__CONFIG_EXPLAIN": "Глобальный заказ будет сделан на выбранных серверах приобретенной статьи, вы можете отключить это глобальное сообщение для статьи при ее создании или изменении.",
-       "SHOP__CONFIG_VARIABLES": "Доступные переменные",
-       "SHOP__CONFIG_VARIABLE_ITEM": "Название купленного предмета",
-       "SHOP__CONFIG_VARIABLE_QUANTITY": "Количество купленного товара",
-       "SHOP__CONFIG_VARIABLE_PLAYER": "Игрок, который купил предмет",
-       "SHOP__CONFIG_VARIABLE_SERVERNAME": "Имя сервера, на котором предмет был куплен",
-       "SHOP__CONFIG_SAVE_SUCCESS": "Конфигурация сохранена!",
+	"SHOP__MENU_CATEGORIES": "Категории",
+	"SHOP__MENU_ITEMS": "Предметы",
+	"SHOP__MENU_VOUCHERS": "Промо-коды",
+	"SHOP__MENU_PAYMENTS": "Платежи",
+	"SHOP__MENU_GIFT": "Подарки",
+	
+	"SHOP__MY_CREDITS": "Мой счёт",
+	"SHOP__MY_CART": "Моя корзина",
+	
+	"SHOP__CONFIG": "Конфигурация",
+	"SHOP__SAVE_SUCCESS": "Сохранено!",
+	"SHOP__SAVE_IN_PROGRESS": "Автоматическое резервное копирование ...",
+	"SHOP__CONFIG_GOAL_TITLE": "Цель месяца",
+	"SHOP__CONFIG_GOAL_DESC": "Оставьте пустым, чтобы удалить",
+	"SHOP__CONFIG_SORT_BY_SERVER": "Сортировать статьи и категории по серверу",
+	"SHOP__CONFIG_BROADCAST_GLOBAL": "Глобальный заказ, сделанный с каждой покупкой",
+	"SHOP__CONFIG_EXPLAIN_TITLE": "Обоснование",
+	"SHOP__CONFIG_EXPLAIN": "Глобальный заказ будет сделан на выбранных серверах приобретенной статьи, вы можете отключить это глобальное сообщение для статьи при ее создании или изменении.",
+	"SHOP__CONFIG_VARIABLES": "Доступные переменные",
+	"SHOP__CONFIG_VARIABLE_ITEM": "Название купленного предмета",
+	"SHOP__CONFIG_VARIABLE_QUANTITY": "Количество купленного товара",
+	"SHOP__CONFIG_VARIABLE_PLAYER": "Игрок, который купил предмет",
+	"SHOP__CONFIG_VARIABLE_SERVERNAME": "Имя сервера, на котором предмет был куплен",
+	"SHOP__CONFIG_SAVE_SUCCESS": "Конфигурация сохранена!",
 
-       "SHOP__ADMIN_MANAGE_ITEMS": "Управление статьями",
-       "SHOP__ADMIN_MANAGE_VOUCHERS": "Управление рекламными акциями",
-       "SHOP__ADMIN_MANAGE_PAYMENT": "Управление платежами",
+	"SHOP__ADMIN_MANAGE_ITEMS": "Управление статьями",
+	"SHOP__ADMIN_MANAGE_VOUCHERS": "Управление рекламными акциями",
+	"SHOP__ADMIN_MANAGE_PAYMENT": "Управление платежами",
 
-       "SHOP__PAYPAL_RETURN_MSG": "Вернитесь к {WEBSITE_NAME}, чтобы набирать очки",
+	"SHOP__PAYPAL_RETURN_MSG": "Вернитесь к {WEBSITE_NAME}, чтобы набирать очки",
 
-       "SHOP__VOUCHERS_MANAGE": "Управление промо-кодами",
-       "SHOP__VOUCHERS_HISTORIES": "История использования промокодов",
-       "SHOP__VOUCHER_END_DATE": "Дата окончания",
-       "SHOP__VOUCHER_START_DATE": "Дата начала",
-       "SHOP__VOUCHER_START_DATE_EXPLAIN": "Если вы установите время начала другой , чем сейчас, ваше продвижение может быть предварительно отображаться в хранилище , если«отображается опция, цель пользователи не будут BLE использовать его",
-       "SHOP__VOUCHER_VALUE_LABEL": "Сокращение",
-       "SHOP__VOUCHER_VALUE_INPUT": "В {MONEY_NAME} или проколоть",
-       "SHOP__VOUCHER_DISPLAYED": "Опубликовано",
-       "SHOP__VOUCHER_CHOOSE_TYPE": "Выберите тип",
-       "SHOP__VOUCHER_MSG_ONE_CATEGORY": "Для того, чтобы содействовать в прогрессе в категории {CATEGORY} с кодом: . {CODE} ({REDUCTION})",
-       "SHOP__VOUCHER_MSG_MANY_CATEGORIES": "В категориях {CATEGORIES} проводится промоакция с кодом:  {CODE} (Reduced {REDUCTION}).",
-       "SHOP__VOUCHER_MSG_ONE_ITEM": "Для того, чтобы содействовать в ходе работы по вопросу {ITEM} с кодом: . {CODE} ({REDUCTION})",
-       "SHOP__VOUCHER_MSG_MANY_ITEMS": "Промоушен выполняется на {ITEMS} элементах с кодом:  {CODE} (Reduced {REDUCTION}).",
-       "SHOP__VOUCHER_MSG_ALL": "В магазине выполняется акция с кодом:  {CODE} (сокращение {REDUCTION}).",
-       "SHOP__VOUCHER_MSG_SOON": "! {REDUCTION} продвижения будет доступен на {START_DATE}",
-       "SHOP__VOUCHER_ADD": "Добавить промо-код",
-       "SHOP__VOUCHER_SELECT": "Действует на",
-       "SHOP__VOUCHER_SELECT_CHOOSE": "Выберите вариант",
-       "SHOP__VOUCHER_GENERATE": "Создать код",
-       "SHOP__VOUCHER_SELECT_ITEMS": "Выберите статью(и)",
-       "SHOP__VOUCHER_SELECT_CATEGORIES": "Выберите категорию(и)",
-       "SHOP__VOUCHER_TYPE_PERCENTAGE": "Процент",
-       "SHOP__VOUCHER_DISPLAY_CHECKBOX": "Если этот флажок установлен, промоушен будет отображаться в магазине",
-       "SHOP__VOUCHER_ADD_SUCCESS": "Акция была добавлена!",
-       "SHOP__VOUCHER_ADD_ERROR_CODE_INVALID": "Ваш код недействителен! (Может быть только буквенно-цифровым, # допускается, максимум 20 символов)",
-       "SHOP__VOUCHER_DELETE_SUCCESS": "Акция была удалена!",
-       "SHOP__VOUCHER_LIMIT": "Лимит использования",
-       "SHOP__VOUCHER_LIMIT_SHORT": "Лимит",
-       "SHOP__VOUCHER_LIMIT_DESC": "Поставь 0 для безлимитов",
-       "SHOP__VOUCHER_LIMIT_TYPE": "Тип ограничения",
-       "SHOP__VOUCHER_LIMIT_TYPE_USER": "На пользователя",
-       "SHOP__VOUCHER_LIMIT_TYPE_GLOBAL": "Глобальный",
-       "SHOP__VOUCHER_CODE": "Код",
-       "SHOP__VOUCHER_REDUCTION": "скидка {MONEY_NAME}",
+	"SHOP__VOUCHERS_MANAGE": "Управление промо-кодами",
+	"SHOP__VOUCHERS_HISTORIES": "История использования промокодов",
+	"SHOP__VOUCHER_END_DATE": "Дата окончания",
+	"SHOP__VOUCHER_START_DATE": "Дата начала",
+	"SHOP__VOUCHER_START_DATE_EXPLAIN": "Если вы установите время начала другой , чем сейчас, ваше продвижение может быть предварительно отображаться в хранилище , если«отображается опция, цель пользователи не будут BLE использовать его",
+	"SHOP__VOUCHER_VALUE_LABEL": "Сокращение",
+	"SHOP__VOUCHER_VALUE_INPUT": "В {MONEY_NAME} или проколоть",
+	"SHOP__VOUCHER_DISPLAYED": "Опубликовано",
+	"SHOP__VOUCHER_CHOOSE_TYPE": "Выберите тип",
+	"SHOP__VOUCHER_MSG_ONE_CATEGORY": "Для того, чтобы содействовать в прогрессе в категории {CATEGORY} с кодом: . {CODE} ({REDUCTION})",
+	"SHOP__VOUCHER_MSG_MANY_CATEGORIES": "В категориях {CATEGORIES} проводится промоакция с кодом:  {CODE} (Reduced {REDUCTION}).",
+	"SHOP__VOUCHER_MSG_ONE_ITEM": "Для того, чтобы содействовать в ходе работы по вопросу {ITEM} с кодом: . {CODE} ({REDUCTION})",
+	"SHOP__VOUCHER_MSG_MANY_ITEMS": "Промоушен выполняется на {ITEMS} элементах с кодом:  {CODE} (Reduced {REDUCTION}).",
+	"SHOP__VOUCHER_MSG_ALL": "В магазине выполняется акция с кодом:  {CODE} (сокращение {REDUCTION}).",
+	"SHOP__VOUCHER_MSG_SOON": "! {REDUCTION} продвижения будет доступен на {START_DATE}",
+	"SHOP__VOUCHER_ADD": "Добавить промо-код",
+	"SHOP__VOUCHER_SELECT": "Действует на",
+	"SHOP__VOUCHER_SELECT_CHOOSE": "Выберите вариант",
+	"SHOP__VOUCHER_GENERATE": "Создать код",
+	"SHOP__VOUCHER_SELECT_ITEMS": "Выберите статью(и)",
+	"SHOP__VOUCHER_SELECT_CATEGORIES": "Выберите категорию(и)",
+	"SHOP__VOUCHER_TYPE_PERCENTAGE": "Процент",
+	"SHOP__VOUCHER_DISPLAY_CHECKBOX": "Если этот флажок установлен, промоушен будет отображаться в магазине",
+	"SHOP__VOUCHER_ADD_SUCCESS": "Акция была добавлена!",
+	"SHOP__VOUCHER_ADD_ERROR_CODE_INVALID": "Ваш код недействителен! (Может быть только буквенно-цифровым, # допускается, максимум 20 символов)",
+	"SHOP__VOUCHER_DELETE_SUCCESS": "Акция была удалена!",
+	"SHOP__VOUCHER_LIMIT": "Лимит использования",
+	"SHOP__VOUCHER_LIMIT_SHORT": "Лимит",
+	"SHOP__VOUCHER_LIMIT_DESC": "Поставь 0 для безлимитов",
+	"SHOP__VOUCHER_LIMIT_TYPE": "Тип ограничения",
+	"SHOP__VOUCHER_LIMIT_TYPE_USER": "На пользователя",
+	"SHOP__VOUCHER_LIMIT_TYPE_GLOBAL": "Глобальный",
+	"SHOP__VOUCHER_CODE": "Код",
+	"SHOP__VOUCHER_REDUCTION": "скидка {MONEY_NAME}",
 
-       "SHOP__PAYSAFECARD": "PaySafeCard",
-       "SHOP__PAYSAFECARD_CODE": "Код",
-       "SHOP__PAYSAFECARD_VALID_USER": "Кто подтвержден?",
-       "SHOP__PAYSAFECARD_HISTORIES": "История транзакций PaySafeCard",
-       "SHOP__PAYSAFECARD_ADMIN_TITLE": "Список ожидающих PaySafeCards",
-       "SHOP__PAYSAFECARD_DISABLE_SUCCESS": "PaySafeCard была деактивирована!",
-       "SHOP__PAYSAFECARD_ENABLE_SUCCESS": "PaySafeCard была деактивирована!",
-       "SHOP__PAYSAFECARD_ERROR_ALREADY_TOO_PSC_IN_DB": "У вас уже есть 2 ожидающих PaySafeCard",
-       "SHOP__PAYSAFECARD_ERROR_ALREADY_IN_DB": "У вас уже есть эта ожидание PaySafeCard",
-       "SHOP__PAYSAFECARD_VALID_SUCCESS": "PaySafeCard была проверена!",
-       "SHOP__PAYSAFECARD_INVALID_SUCCESS": "В PaySafeCard отказано!",
-       "SHOP__PAYSAFECARD_ADD_SUCCESS": "PaySafeCard добавлен! Вы получите ответ в течение 48 часов",
-       "SHOP__PAYSAFECARD_VALID_CONFIRM": "Сколько Очков Магазина вы хотите дать за эту PaySafeCard?",
-       "SHOP__PAYSAFECARD_MESSAGE_VALID": "Ваша {AMOUNT} PaySafeCard была подтверждена! Вы зарабатываете {POINTS} {MONEY_NAME}.",
-       "SHOP__PAYSAFECARD_MESSAGE_INVALID": "Ваша {AMOUNT} PaySafeCard была отклонена.",
-       "SHOP__PAYSAFECARD_ACCEPT": "Подтвердить",
-       "SHOP__PAYSAFECARD_REFUSE": "Запретить",
+	"SHOP__PAYSAFECARD": "PaySafeCard",
+	"SHOP__PAYSAFECARD_CODE": "Код",
+	"SHOP__PAYSAFECARD_VALID_USER": "Кто подтвержден?",
+	"SHOP__PAYSAFECARD_HISTORIES": "История транзакций PaySafeCard",
+	"SHOP__PAYSAFECARD_ADMIN_TITLE": "Список ожидающих PaySafeCards",
+	"SHOP__PAYSAFECARD_DISABLE_SUCCESS": "PaySafeCard была деактивирована!",
+	"SHOP__PAYSAFECARD_ENABLE_SUCCESS": "PaySafeCard была деактивирована!",
+	"SHOP__PAYSAFECARD_ERROR_ALREADY_TOO_PSC_IN_DB": "У вас уже есть 2 ожидающих PaySafeCard",
+	"SHOP__PAYSAFECARD_ERROR_ALREADY_IN_DB": "У вас уже есть эта ожидание PaySafeCard",
+	"SHOP__PAYSAFECARD_VALID_SUCCESS": "PaySafeCard была проверена!",
+	"SHOP__PAYSAFECARD_INVALID_SUCCESS": "В PaySafeCard отказано!",
+	"SHOP__PAYSAFECARD_ADD_SUCCESS": "PaySafeCard добавлен! Вы получите ответ в течение 48 часов",
+	"SHOP__PAYSAFECARD_VALID_CONFIRM": "Сколько Очков Магазина вы хотите дать за эту PaySafeCard?",
+	"SHOP__PAYSAFECARD_MESSAGE_VALID": "Ваша {AMOUNT} PaySafeCard была подтверждена! Вы зарабатываете {POINTS} {MONEY_NAME}.",
+	"SHOP__PAYSAFECARD_MESSAGE_INVALID": "Ваша {AMOUNT} PaySafeCard была отклонена.",
+	"SHOP__PAYSAFECARD_ACCEPT": "Подтвердить",
+	"SHOP__PAYSAFECARD_REFUSE": "Запретить",
 
-       "SHOP__DEDIPASS_PAYMENT": "Оплатить с помощью dedipass",
-       "SHOP__DEDIPASS_CONFIGURATION": "Конфигурация Dedipass",
-       "SHOP__DEDIPASS_EDIT_CONFIG_SUCCESS": "Конфигурация была успешно отредактирована!",
-       "SHOP__DEDIPASS_TOGGLE_ERROR_NO_CONFIG": "Вы не можете активировать Dedipass, если вы ранее не устанавливали открытый ключ!",
-       "SHOP__DEDIPASS_TOGGLE_ENABLE_SUCCESS": "Вы успешно активировали Dedipass в качестве способа оплаты!",
-       "SHOP__DEDIPASS_TOGGLE_DISABLE_SUCCESS": "Вы отключили Dedipass в качестве способа оплаты!",
-       "SHOP__DEDIPASS_PUBLICKEY": "Открытый ключ (называемый <i> data-dedipass </ i> в части установки Dédipass)",
-       "SHOP__DEDIPASS_HISTORIES": "История транзакций Dedipass",
-       "SHOP__DEDIPASS_PAYMENT_ERROR_NOT_CONNECTED": "Вы не вошли в систему, пожалуйста, войдите в систему и повторите попытку (ранее введенный код: {CODE}).",
-       "SHOP__DEDIPASS_PAYMENT_ERROR_INVAID_CODE": "Введенный код недействителен",
-       "SHOP__DEDIPASS_PAYMENT_ERROR_EMPTY_CODE": "Пожалуйста, введите код.",
-       "SHOP__DEDIPASS_PAYMENT_ERROR_EMPTY_RATE": "Пожалуйста, выберите предложение",
-       "SHOP__DEDIPASS_PAYMENT_SUCCESS": "Транзакция Dedipass прошла успешно, вам зачислено {MONEY} {MONEY_NAME}.",
-       "SHOP__DEDIPASS_CODE": "Код",
-       "SHOP__DEDIPASS_RATE": "Посадка",
-       "SHOP__DEDIPASS_EXPLAIN_CONFIG": "Чтобы использовать Dedipass, вам необходимо зарегистрироваться на веб-сайте <b> Dedipass </ b>, а затем добавить новый сервис. Вы должны выбрать <i> виртуальную валюту </ i> и затем настроить необходимые вам. следующие URL: ",
-       "SHOP__DEDIPASS_EXPLAIN_CONFIG_URL_1": "Установка URL",
-       "SHOP__DEDIPASS_EXPLAIN_CONFIG_URL_2": "URL перенаправления",
+	"SHOP__DEDIPASS_PAYMENT": "Оплатить с помощью dedipass",
+	"SHOP__DEDIPASS_CONFIGURATION": "Конфигурация Dedipass",
+	"SHOP__DEDIPASS_EDIT_CONFIG_SUCCESS": "Конфигурация была успешно отредактирована!",
+	"SHOP__DEDIPASS_TOGGLE_ERROR_NO_CONFIG": "Вы не можете активировать Dedipass, если вы ранее не устанавливали открытый ключ!",
+	"SHOP__DEDIPASS_TOGGLE_ENABLE_SUCCESS": "Вы успешно активировали Dedipass в качестве способа оплаты!",
+	"SHOP__DEDIPASS_TOGGLE_DISABLE_SUCCESS": "Вы отключили Dedipass в качестве способа оплаты!",
+	"SHOP__DEDIPASS_PUBLICKEY": "Открытый ключ (называемый <i> data-dedipass </ i> в части установки Dédipass)",
+	"SHOP__DEDIPASS_HISTORIES": "История транзакций Dedipass",
+	"SHOP__DEDIPASS_PAYMENT_ERROR_NOT_CONNECTED": "Вы не вошли в систему, пожалуйста, войдите в систему и повторите попытку (ранее введенный код: {CODE}).",
+	"SHOP__DEDIPASS_PAYMENT_ERROR_INVAID_CODE": "Введенный код недействителен",
+	"SHOP__DEDIPASS_PAYMENT_ERROR_EMPTY_CODE": "Пожалуйста, введите код.",
+	"SHOP__DEDIPASS_PAYMENT_ERROR_EMPTY_RATE": "Пожалуйста, выберите предложение",
+	"SHOP__DEDIPASS_PAYMENT_SUCCESS": "Транзакция Dedipass прошла успешно, вам зачислено {MONEY} {MONEY_NAME}.",
+	"SHOP__DEDIPASS_CODE": "Код",
+	"SHOP__DEDIPASS_RATE": "Посадка",
+	"SHOP__DEDIPASS_EXPLAIN_CONFIG": "Чтобы использовать Dedipass, вам необходимо зарегистрироваться на веб-сайте <b> Dedipass </ b>, а затем добавить новый сервис. Вы должны выбрать <i> виртуальную валюту </ i> и затем настроить необходимые вам. следующие URL: ",
+	"SHOP__DEDIPASS_EXPLAIN_CONFIG_URL_1": "Установка URL",
+	"SHOP__DEDIPASS_EXPLAIN_CONFIG_URL_2": "URL перенаправления",
 
-       "SHOP__USER_POINTS_TRANSFER": "Отправить деньги",
-       "SHOP__USER_POINTS_TRANSFER_ADMIN": "Передача очков",
-       "SHOP__USER_POINTS_TRANSFER_HISTORIES": "{MONEY_NAME} перенести историю между игроками",
-       "SHOP__USER_POINTS_TRANSFER_WHO": "Кто?",
-       "SHOP__USER_POINTS_TRANSFER_HOW_MANY": "Сколько?",
-       "SHOP__USER_POINTS_TRANSFER_ERROR_EMPTY": "Вы ничего не можете отправить",
-       "SHOP__USER_POINTS_TRANSFER_ERROR_YOURSELF": "Вы не можете переводить кредиты себе",
-       "SHOP__USER_POINTS_TRANSFER_ERROR_DISABLED": "Передача баллов отключена.",
-       "SHOP__USER_POINTS_TRANSFER_ERROR_WAIT": "Вам нужно немного подождать, прежде чем вы сможете перевести.",
-       "SHOP__USER_POINTS_TRANSFER_SUCCESS": "Деньги отправлены!",
-       "SHOP__TRANSFER_ENABLE_SUCCESS": "Вы активировали перевод очков!",
-       "SHOP__TRANSFER_DISABLE_SUCCESS": "Вы отключили передачу баллов!",
-	
-       "SHOP__GIFTALL": "Сделай подарок каждому",
-         "SHOP__GIFTALL_VALUE": "Количество точек магазина, которые должны быть предоставлены всем пользователям сайта",
-         "SHOP__GIFTALL_SUCCESS": "Ваш подарок сделан",
+	"SHOP__USER_POINTS_TRANSFER": "Отправить деньги",
+	"SHOP__USER_POINTS_TRANSFER_ADMIN": "Передача очков",
+	"SHOP__USER_POINTS_TRANSFER_HISTORIES": "{MONEY_NAME} перенести историю между игроками",
+	"SHOP__USER_POINTS_TRANSFER_WHO": "Кто?",
+	"SHOP__USER_POINTS_TRANSFER_HOW_MANY": "Сколько?",
+	"SHOP__USER_POINTS_TRANSFER_ERROR_EMPTY": "Вы ничего не можете отправить",
+	"SHOP__USER_POINTS_TRANSFER_ERROR_YOURSELF": "Вы не можете переводить кредиты себе",
+	"SHOP__USER_POINTS_TRANSFER_ERROR_DISABLED": "Передача баллов отключена.",
+	"SHOP__USER_POINTS_TRANSFER_ERROR_WAIT": "Вам нужно немного подождать, прежде чем вы сможете перевести.",
+	"SHOP__USER_POINTS_TRANSFER_SUCCESS": "Деньги отправлены!",
+	"SHOP__TRANSFER_ENABLE_SUCCESS": "Вы активировали перевод очков!",
+	"SHOP__TRANSFER_DISABLE_SUCCESS": "Вы отключили передачу баллов!",
 
-       "SHOP__ITEM": "Статья",
-       "SHOP__ITEMS": "Статьи",
-       "SHOP__ITEM_ADD_COMMAND": "Добавить заказ",
-       "SHOP__ITEM_EDIT": "Редактирование статьи",
-       "SHOP__ITEMS_AVAILABLE": "Товары для продажи",
-       "SHOP__ITEM_NAME": "Имя",
-       "SHOP__ITEM_IMG_URL": "URL изображения",
-       "SHOP__ITEM_PRICE": "Цена",
-       "SHOP__ITEM_QUANTITY": "Количество",
-       "SHOP__ITEM_TOTAL": "Всего",
-       "SHOP__ITEM_DESCRIPTION": "Описание",
-       "SHOP__ITEM_EDIT_SUCCESS": "Статья успешно изменена!",
-       "SHOP__ITEM_DELETE_SUCCESS": "Статья успешно удалена!",
-       "SHOP__ITEM_ADD_SUCCESS": "Статья успешно добавлена!",
-       "SHOP__ITEM_ADD": "Добавить статью",
-       "SHOP__ITEM_TIMED_COMMAND": "РАЗЛИЧНЫЕ КОМАНДЫ",
-       "SHOP__ITEM_TIMED_COMMAND_DESC": "Это команда, которая будет выполнена через определенное время (например, для оценок)",
-       "SHOP__ITEM_TIMED_COMMAND_TIME": "Время",
-       "SHOP__ITEM_DISPLAY_SERVER": "Показать сервер (ы), где будет предоставлена ​​статья.",
-       "SHOP__ITEM_CHECKBOX_CONNECT": "Требовать, чтобы игрок был подключен к серверу, чтобы купить статью",
-       "SHOP__ITEM_CHECKBOX_DISPLAY": "Показать статью в магазине",
-       "SHOP__ITEM_MULTIPLE_BUY": "Разрешить покупку этого предмета несколько раз (только за одну покупку)",
-       "SHOP__ITEM_CANT_BUY_MULTIPLE": "Вы не можете купить этот товар (<i> {ITEM_NAME} </ i>) более одного раза",
-       "SHOP__ITEM_CART": "Разрешить добавить в корзину этой статьи",
-       "SHOP__ITEM_CANT_ADDED_TO_CART": "Вы не можете купить товар <i> {ITEM_NAME} </ i> с помощью корзины.",
-       "SHOP__ITEM_CANT_BUY_LIMIT": "Вы не можете купить товар <i> {ITEM_NAME} </ i> более {LIMIT} раз.",
-       "SHOP__ITEM_BROADCAST_GLOBAL": "Сделать глобальный заказ при покупке этого товара",
-       "SHOP__ITEM_PREREQUISITES": "Вы хотите активировать предварительные условия?",
-       "SHOP__ITEM_PREREQUISITES_TYPE_0": "Нет",
-       "SHOP__ITEM_PREREQUISITES_TYPE_1": "Да, игрок должен был купить все следующие предметы",
-       "SHOP__ITEM_PREREQUISITES_TYPE_2": "Да, игрок должен был купить хотя бы один из следующих предметов",
-       "SHOP__ITEM_PREREQUISITES_ITEMS": "Доступные позиции",
-       "SHOP__ITEM_CHECKBOX_REDUCTIONAL_ITEMS": "Активировать снижение цены или один из следующих предметов куплен / куплен",
-       "SHOP__ITEM_REDUCTIONAL_ITEMS_LIST": "Скидка применяется к этому товару ({REDUCTION}), потому что вы уже приобрели следующие товары {ITEMS_LIST}.",
-       "SHOP__ITEM_CANT_BUY_PREREQUISITES_1": "Вы не можете купить этот предмет у следующих предметов:  {ITEMS}",
-       "SHOP__ITEM_CANT_BUY_PREREQUISITES_2": "Вы не можете купить этот предмет у следующих предметов:  {ITEMS}",
-       "SHOP__ITEM_GIVE_SKIN": "Дать разрешение на изменение скина при покупке этой статьи",
-       "SHOP__ITEM_GIVE_CAPE": "Дать разрешение сменить накидку при покупке этой статьи",
-       "SHOP__ITEM_CANT_BUY_NOT_CONNECTED": "Вы должны войти в систему, чтобы купить предмет <b> {ITEM_NAME} </ b>!",
-       "SHOP__ITEM_BUY_LIMIT": "Лимит покупки (сколько можно купить максимум)",
-       "SHOP__ITEM_BUY_LIMIT_PLACEHOLDER": "Поставьте 0 для безлимитных",
-       "SHOP__ITEM_WAIT_TIME": "Интервал времени между покупками",
-       "SHOP__ITEM_CANT_BUY_WAIT_TIME": "Вы не можете купить предмет <i> {ITEM_NAME} </ i> сейчас! Каждая покупка должна быть отделена от {WAIT_TIME}.",
-       "SHOP__ITEMS_AVAILABLE_OTHER": "Элементы не указаны",
-       "SHOP__ITEM_CURRENCY": "Валюта (EUR, USD ...)",
-       "SHOP__CATEGORIES": "Категории",
-       "SHOP__CATEGORY": "Категория",
-       "SHOP__CATEGORY_ADD": "Добавить категорию",
-       "SHOP__CATEGORY_ADD_SUCCESS": "Категория успешно добавлена!",
-       "SHOP__CATEGORY_EDIT_SUCCESS": "Категория успешно изменена!",
-       "SHOP__CATEGORY_DELETE_SUCCESS": "Категория успешно удалена!",
-       "SHOP__CATEGORY_NUMBER": "Количество статей, связанных с категорией",
+	"SHOP__GIFTALL": "Сделай подарок каждому",
+	 "SHOP__GIFTALL_VALUE": "Количество точек магазина, которые должны быть предоставлены всем пользователям сайта",
+	 "SHOP__GIFTALL_SUCCESS": "Ваш подарок сделан",
+
+	"SHOP__ITEM": "Статья",
+	"SHOP__ITEMS": "Статьи",
+	"SHOP__ITEM_ADD_COMMAND": "Добавить заказ",
+	"SHOP__ITEM_EDIT": "Редактирование статьи",
+	"SHOP__ITEMS_AVAILABLE": "Товары для продажи",
+	"SHOP__ITEM_NAME": "Имя",
+	"SHOP__ITEM_IMG_URL": "URL изображения",
+	"SHOP__ITEM_PRICE": "Цена",
+	"SHOP__ITEM_QUANTITY": "Количество",
+	"SHOP__ITEM_TOTAL": "Всего",
+	"SHOP__ITEM_DESCRIPTION": "Описание",
+	"SHOP__ITEM_EDIT_SUCCESS": "Статья успешно изменена!",
+	"SHOP__ITEM_DELETE_SUCCESS": "Статья успешно удалена!",
+	"SHOP__ITEM_ADD_SUCCESS": "Статья успешно добавлена!",
+	"SHOP__ITEM_ADD": "Добавить статью",
+	"SHOP__ITEM_TIMED_COMMAND": "РАЗЛИЧНЫЕ КОМАНДЫ",
+	"SHOP__ITEM_TIMED_COMMAND_DESC": "Это команда, которая будет выполнена через определенное время (например, для оценок)",
+	"SHOP__ITEM_TIMED_COMMAND_TIME": "Время",
+	"SHOP__ITEM_DISPLAY_SERVER": "Показать сервер (ы), где будет предоставлена ​​статья.",
+	"SHOP__ITEM_CHECKBOX_CONNECT": "Требовать, чтобы игрок был подключен к серверу, чтобы купить статью",
+	"SHOP__ITEM_CHECKBOX_DISPLAY": "Показать статью в магазине",
+	"SHOP__ITEM_MULTIPLE_BUY": "Разрешить покупку этого предмета несколько раз (только за одну покупку)",
+	"SHOP__ITEM_CANT_BUY_MULTIPLE": "Вы не можете купить этот товар (<i> {ITEM_NAME} </ i>) более одного раза",
+	"SHOP__ITEM_CART": "Разрешить добавить в корзину этой статьи",
+	"SHOP__ITEM_CANT_ADDED_TO_CART": "Вы не можете купить товар <i> {ITEM_NAME} </ i> с помощью корзины.",
+	"SHOP__ITEM_CANT_BUY_LIMIT": "Вы не можете купить товар <i> {ITEM_NAME} </ i> более {LIMIT} раз.",
+	"SHOP__ITEM_BROADCAST_GLOBAL": "Сделать глобальный заказ при покупке этого товара",
+	"SHOP__ITEM_PREREQUISITES": "Вы хотите активировать предварительные условия?",
+	"SHOP__ITEM_PREREQUISITES_TYPE_0": "Нет",
+	"SHOP__ITEM_PREREQUISITES_TYPE_1": "Да, игрок должен был купить все следующие предметы",
+	"SHOP__ITEM_PREREQUISITES_TYPE_2": "Да, игрок должен был купить хотя бы один из следующих предметов",
+	"SHOP__ITEM_PREREQUISITES_ITEMS": "Доступные позиции",
+	"SHOP__ITEM_CHECKBOX_REDUCTIONAL_ITEMS": "Активировать снижение цены или один из следующих предметов куплен / куплен",
+	"SHOP__ITEM_REDUCTIONAL_ITEMS_LIST": "Скидка применяется к этому товару ({REDUCTION}), потому что вы уже приобрели следующие товары {ITEMS_LIST}.",
+	"SHOP__ITEM_CANT_BUY_PREREQUISITES_1": "Вы не можете купить этот предмет у следующих предметов:  {ITEMS}",
+	"SHOP__ITEM_CANT_BUY_PREREQUISITES_2": "Вы не можете купить этот предмет у следующих предметов:  {ITEMS}",
+	"SHOP__ITEM_GIVE_SKIN": "Дать разрешение на изменение скина при покупке этой статьи",
+	"SHOP__ITEM_GIVE_CAPE": "Дать разрешение сменить накидку при покупке этой статьи",
+	"SHOP__ITEM_CANT_BUY_NOT_CONNECTED": "Вы должны войти в систему, чтобы купить предмет <b> {ITEM_NAME} </ b>!",
+	"SHOP__ITEM_BUY_LIMIT": "Лимит покупки (сколько можно купить максимум)",
+	"SHOP__ITEM_BUY_LIMIT_PLACEHOLDER": "Поставьте 0 для безлимитных",
+	"SHOP__ITEM_WAIT_TIME": "Интервал времени между покупками",
+	"SHOP__ITEM_CANT_BUY_WAIT_TIME": "Вы не можете купить предмет <i> {ITEM_NAME} </ i> сейчас! Каждая покупка должна быть отделена от {WAIT_TIME}.",
+	"SHOP__ITEMS_AVAILABLE_OTHER": "Элементы не указаны",
+	"SHOP__ITEM_CURRENCY": "Валюта (EUR, USD ...)",
+	"SHOP__CATEGORIES": "Категории",
+	"SHOP__CATEGORY": "Категория",
+	"SHOP__CATEGORY_ADD": "Добавить категорию",
+	"SHOP__CATEGORY_ADD_SUCCESS": "Категория успешно добавлена!",
+	"SHOP__CATEGORY_EDIT_SUCCESS": "Категория успешно изменена!",
+	"SHOP__CATEGORY_DELETE_SUCCESS": "Категория успешно удалена!",
+	"SHOP__CATEGORY_NUMBER": "Количество статей, связанных с категорией",
+	
+	"SHOP__CATEGORIES_TIP": "",
+	"SHOP__SECTION_TIP": "",
+	"SHOP__SECTION": "Разделы",
+	"SHOP__SECTION_AND_CATEGORIES": "РАЗДЕЛЫ И КАТЕГОРИИ",
+	"SHOP__SECTIONS": "Раздел",
+	"SHOP__CATEGORIES_NO": "Без категории",
+	"SHOP__CATEGORIES_OTHER":"Прочие категории",
 
-       "SHOP__BUY": "Купить",
-       "SHOP__BUY_CART": "Посмотреть мою корзину",
-       "SHOP__BUY_CART_EMPTY": "Ваша корзина пуста.",
-       "SHOP__BUY_ADD_TO_CART": "Добавить в корзину",
-       "SHOP__BUY_ADDED_TO_CART": "Добавлено в корзину",
-       "SHOP__BUY_ERROR_NO_ENOUGH_MONEY": "У вас недостаточно денег для совершения этой покупки.",
-       "SHOP__BUY_ERROR_NEED_LOGIN": "Вы должны войти в систему, чтобы сделать покупку.",
-       "SHOP__BUY_ERROR_EMPTY": "Вы ничего не можете купить.",
-       "SHOP__BUY_ERROR_NO_CONNECTED": "Вы должны войти в систему, чтобы сделать эту покупку.",
-       "SHOP__BUY_CONFIRM": "Вы действительно хотите купить этот предмет?",
-       "SHOP__BUY_SUCCESS": "Покупка только что была сделана",
-       "SHOP__BUY_VOUCHER_ASK": "У вас есть промо-код?",
+	"SHOP__BUY": "Купить",
+	"SHOP__BUY_CART": "Посмотреть мою корзину",
+	"SHOP__BUY_CART_EMPTY": "Ваша корзина пуста.",
+	"SHOP__BUY_ADD_TO_CART": "Добавить в корзину",
+	"SHOP__BUY_ADDED_TO_CART": "Добавлено в корзину",
+	"SHOP__BUY_ERROR_NO_ENOUGH_MONEY": "У вас недостаточно денег для совершения этой покупки.",
+	"SHOP__BUY_ERROR_NEED_LOGIN": "Вы должны войти в систему, чтобы сделать покупку.",
+	"SHOP__BUY_ERROR_EMPTY": "Вы ничего не можете купить.",
+	"SHOP__BUY_ERROR_NO_CONNECTED": "Вы должны войти в систему, чтобы сделать эту покупку.",
+	"SHOP__BUY_CONFIRM": "Вы действительно хотите купить этот предмет?",
+	"SHOP__BUY_SUCCESS": "Покупка только что была сделана",
+	"SHOP__BUY_VOUCHER_ASK": "У вас есть промо-код?",
 
-       "SHOP__ADD_MONEY": "Кредитный счет",
-       "SHOP__MONEY_CURRENTLY": "У вас сейчас есть",
+	"SHOP__ADD_MONEY": "Кредитный счет",
+	"SHOP__MONEY_CURRENTLY": "У вас сейчас есть",
 
-       "SHOP__PAYPAL_OFFERS": "Предложения PayPal",
-       "SHOP__PAYPAL_OFFER": "Предложение",
-       "SHOP__PAYPAL_HISTORIES": "История транзакций PayPal",
-       "SHOP__PAYPAL_MAIL": "Электронная почта",
-       "SHOP__PAYPAL_OFFER_ADD": "Добавить в предложение PayPal",
-       "SHOP__PAYPAL_OFFER_ADD_SUCCESS": "Предложение PayPal успешно добавлено!",
-       "SHOP__PAYPAL_OFFER_EDIT": "Изменить предложение PayPal",
-       "SHOP__PAYPAL_OFFER_EDIT_SUCCESS": "Предложение PayPal успешно изменено!",
-       "SHOP__PAYPAL_OFFER_DELETE_SUCCESS": "Предложение PayPal было удалено!",
-       "SHOP__PAYPAL_PAYMENT_ID": "идентификатор PayPal",
-       "SHOP__PAYPAL_PAYMENT_DELAY": "Пользователи могут быть зачислены на счет в течение 5 минут после оплаты через PayPal. Эта задержка зависит от услуг PayPal.",
+	"SHOP__PAYPAL_OFFERS": "Предложения PayPal",
+	"SHOP__PAYPAL_OFFER": "Предложение",
+	"SHOP__PAYPAL_HISTORIES": "История транзакций PayPal",
+	"SHOP__PAYPAL_MAIL": "Электронная почта",
+	"SHOP__PAYPAL_OFFER_ADD": "Добавить в предложение PayPal",
+	"SHOP__PAYPAL_OFFER_ADD_SUCCESS": "Предложение PayPal успешно добавлено!",
+	"SHOP__PAYPAL_OFFER_EDIT": "Изменить предложение PayPal",
+	"SHOP__PAYPAL_OFFER_EDIT_SUCCESS": "Предложение PayPal успешно изменено!",
+	"SHOP__PAYPAL_OFFER_DELETE_SUCCESS": "Предложение PayPal было удалено!",
+	"SHOP__PAYPAL_PAYMENT_ID": "идентификатор PayPal",
+	"SHOP__PAYPAL_PAYMENT_DELAY": "Пользователи могут быть зачислены на счет в течение 5 минут после оплаты через PayPal. Эта задержка зависит от услуг PayPal.",
 
-       "SHOP__NANO_OFFERS": "Нано предложения",
-       "SHOP__NANO_OFFER": "Предложение",
-       "SHOP__NANO_HISTORIES": "История нанотранзакций",
-       "SHOP__NANO_ADDRESS": "адрес (nano _...)",
-       "SHOP__NANO_OFFER_ADD": "Добавить предложение Nano",
-       "SHOP__NANO_OFFER_ADD_SUCCESS": "Нано предложение успешно добавлено!",
-       "SHOP__NANO_OFFER_EDIT": "Изменить предложение Nano",
-       "SHOP__NANO_OFFER_EDIT_SUCCESS": "Нано предложение успешно изменено!",
-       "SHOP__NANO_OFFER_DELETE_SUCCESS": "Нано предложение удалено !",
-       "SHOP__ERROR_NANO_ADDRESS_NOT_VALID": "Нано-адрес недействителен!",
-       "SHOP__NANO_EXPLAIN_CONFIG_1": "Для начала вам нужен кошелек или на: ",
-       "SHOP__NANO_EXPLAIN_CONFIG_2": "или с помощью мобильного приложения",
-       "SHOP__NANO_EXPLAIN_CONFIG_3": "Краткое введение Nano доступно",
-       "SHOP__NANO_EXPLAIN_CONFIG_4": "Вы можете получить больше информации",
-       "SHOP__OFFER_MONEY_TO_ADD": "Сколько {MONEY_NAME} вы хотите дать?",
+	"SHOP__NANO_OFFERS": "Нано предложения",
+	"SHOP__NANO_OFFER": "Предложение",
+	"SHOP__NANO_HISTORIES": "История нанотранзакций",
+	"SHOP__NANO_ADDRESS": "адрес (nano _...)",
+	"SHOP__NANO_OFFER_ADD": "Добавить предложение Nano",
+	"SHOP__NANO_OFFER_ADD_SUCCESS": "Нано предложение успешно добавлено!",
+	"SHOP__NANO_OFFER_EDIT": "Изменить предложение Nano",
+	"SHOP__NANO_OFFER_EDIT_SUCCESS": "Нано предложение успешно изменено!",
+	"SHOP__NANO_OFFER_DELETE_SUCCESS": "Нано предложение удалено !",
+	"SHOP__ERROR_NANO_ADDRESS_NOT_VALID": "Нано-адрес недействителен!",
+	"SHOP__NANO_EXPLAIN_CONFIG_1": "Для начала вам нужен кошелек или на: ",
+	"SHOP__NANO_EXPLAIN_CONFIG_2": "или с помощью мобильного приложения",
+	"SHOP__NANO_EXPLAIN_CONFIG_3": "Краткое введение Nano доступно",
+	"SHOP__NANO_EXPLAIN_CONFIG_4": "Вы можете получить больше информации",
+	"SHOP__OFFER_MONEY_TO_ADD": "Сколько {MONEY_NAME} вы хотите дать?",
 
-       "SHOP__STARPASS_OFFERS": "Предложения StarPass",
-       "SHOP__STARPASS_CODE": "Код",
-       "SHOP__STARPASS_OFFER": "Предложение",
-       "SHOP__STARPASS_HISTORIES": "История транзакций StarPass",
-       "SHOP__STARPASS_OFFER_DELETE_SUCCESS": "Предложение StarPass удалено!",
-       "SHOP__STARPASS_OFFER_ADD": "Добавить предложение StarPass",
-       "SHOP__STARPASS_OFFER_ADD_SUCCESS": "Предложение StarPass успешно добавлено!",
-       "SHOP__STARPASS_OFFER_EDIT": "Изменить предложение StarPass",
-       "SHOP__STARPASS_OFFER_EDIT_SUCCESS": "Предложение StarPass успешно изменено!",
-       "SHOP__STARPASS_PAYMENT": "Создать учетную запись с StarPass",
-       "SHOP__STARPASS_PAYMENT_SUCCESS": "Транзакция StarPass прошла успешно! Вы получили свой кредитный магазин.",
-       "SHOP__STARPASS_PAYMENT_ERROR": "Введенный код не так, пожалуйста , попробуйте еще раз.",
+	"SHOP__STARPASS_OFFERS": "Предложения StarPass",
+	"SHOP__STARPASS_CODE": "Код",
+	"SHOP__STARPASS_OFFER": "Предложение",
+	"SHOP__STARPASS_HISTORIES": "История транзакций StarPass",
+	"SHOP__STARPASS_OFFER_DELETE_SUCCESS": "Предложение StarPass удалено!",
+	"SHOP__STARPASS_OFFER_ADD": "Добавить предложение StarPass",
+	"SHOP__STARPASS_OFFER_ADD_SUCCESS": "Предложение StarPass успешно добавлено!",
+	"SHOP__STARPASS_OFFER_EDIT": "Изменить предложение StarPass",
+	"SHOP__STARPASS_OFFER_EDIT_SUCCESS": "Предложение StarPass успешно изменено!",
+	"SHOP__STARPASS_PAYMENT": "Создать учетную запись с StarPass",
+	"SHOP__STARPASS_PAYMENT_SUCCESS": "Транзакция StarPass прошла успешно! Вы получили свой кредитный магазин.",
+	"SHOP__STARPASS_PAYMENT_ERROR": "Введенный код не так, пожалуйста , попробуйте еще раз.",
 
-       "SHOP__DASHBOARD_GRAPH_ERROR": "У вас должно быть более 5 различных элементов для доступа к диаграмме",
-       "SHOP__ADMIN_PART_2": "Администрирование кредитов",
-       "SHOP__ADMIN_PART_1": "Вернитесь в магазин",
-       "SHOP__HISTORY_TRANSFER_MONEY": "История обмена",
-       "SHOP__HISTORY_PURCHASES": "История покупок",
-       "SHOP__HISTORY_PURCHASES_MONEY": "{MONEY_NAME} История покупки",
+	"SHOP__DASHBOARD_GRAPH_ERROR": "У вас должно быть более 5 различных элементов для доступа к диаграмме",
+	"SHOP__ADMIN_PART_2": "Администрирование кредитов",
+	"SHOP__ADMIN_PART_1": "Вернитесь в магазин",
+	"SHOP__HISTORY_TRANSFER_MONEY": "История обмена",
+	"SHOP__HISTORY_PURCHASES": "История покупок",
+	"SHOP__HISTORY_PURCHASES_MONEY": "{MONEY_NAME} История покупки",
 
-       "PERMISSIONS__CREDIT_ACCOUNT": "Создать аккаунт",
-       "PERMISSIONS__CAN_BUY": "Buy",
-       "PERMISSIONS__SHOP__ADMIN_MANAGE_ITEMS": "Управление товарами магазина (добавление, редактирование, удаление)",
-       "PERMISSIONS__SHOP__ADMIN_MANAGE_VOUCHERS": "Управление промо-кодами магазина (добавить, удалить)",
-       "PERMISSIONS__SHOP__ADMIN_MANAGE_PAYMENT": "Управление платежами магазина (добавление, редактирование, удаление, проверка PSC ...)",
-       "PERMISSIONS__VOTE__ADMIN_VIEW_TOP": "Перейти на верхнюю страницу голосования",
-       "PERMISSIONS__SHOP__ADMIN_GIFTALL": "Управление подарками (пожертвование баллов)",
-       "PERMISSIONS__SHOP__ADMIN_MANAGE_CATEGORIES": "Управление категориями магазина (Добавить, Изменить, Удалить)",
+	"PERMISSIONS__CREDIT_ACCOUNT": "Создать аккаунт",
+	"PERMISSIONS__CAN_BUY": "Buy",
+	"PERMISSIONS__SHOP__ADMIN_MANAGE_ITEMS": "Управление товарами магазина (добавление, редактирование, удаление)",
+	"PERMISSIONS__SHOP__ADMIN_MANAGE_VOUCHERS": "Управление промо-кодами магазина (добавить, удалить)",
+	"PERMISSIONS__SHOP__ADMIN_MANAGE_PAYMENT": "Управление платежами магазина (добавление, редактирование, удаление, проверка PSC ...)",
+	"PERMISSIONS__VOTE__ADMIN_VIEW_TOP": "Перейти на верхнюю страницу голосования",
+	"PERMISSIONS__SHOP__ADMIN_GIFTALL": "Управление подарками (пожертвование баллов)",
+	"PERMISSIONS__SHOP__ADMIN_MANAGE_CATEGORIES": "Управление категориями магазина (Добавить, Изменить, Удалить)",
 
-       "NOTIFICATION__NEW_VOUCHER": "Доступен новый промокод!",
-       "NOTIFICATION__NEW_PSC": "Новая PaySafeCard должна быть проверена!",
-       "NOTIFICATION__PAYPAL_IPN_VALIDED": "Ваш платеж PayPal подтвержден!",
-       "NOTIFICATION__NANO_VALIDED": "Ваш нано платеж подтвержден!",
+	"NOTIFICATION__NEW_VOUCHER": "Доступен новый промокод!",
+	"NOTIFICATION__NEW_PSC": "Новая PaySafeCard должна быть проверена!",
+	"NOTIFICATION__PAYPAL_IPN_VALIDED": "Ваш платеж PayPal подтвержден!",
+	"NOTIFICATION__NANO_VALIDED": "Ваш нано платеж подтвержден!",
 
-       "HISTORY__CATEGORY_SHOP": "Магазин",
-       "HISTORY__CATEGORY_CREDIT_SHOP": "Кредитование магазина",
-       "HISTORY__ACTION_VALID_PAYSAFECARD": "Проверка PaySafeCard",
-       "HISTORY__ACTION_DELETE_VOUCHER": "Подавление промокода",
-       "HISTORY__ACTION_ADD_VOUCHER": "Добавление промо-кода",
-       "HISTORY__ACTION_BUY_MONEY_DEDIPASS": "Покупка кредитов Dedipass",
-       "HISTORY__ACTION_EDIT_DEDIPASS_CONFIG": "Изменение конфигурации Dedipass",
-       "HISTORY__ACTION_DELETE_ITEM": "Удаление товара из магазина",
-       "HISTORY__ACTION_ADD_ITEM": "Добавить статью о магазине",
-       "HISTORY__ACTION_ADD_CATEGORY": "Добавить категорию в магазин",
-       "HISTORY__ACTION_BUY_ITEM": "Покупка",
-       "HISTORY__ACTION_BUY_MONEY": "Покупка торговых точек",
-       "HISTORY__ACTION_SEND_MONEY": "Отправить деньги",
-       "HISTORY__ACTION_ADD_PAYPAL_OFFER": "Добавление предложения PayPal",
-       "HISTORY__ACTION_ADD_NANO_OFFER": "Добавление нано-предложения",
-       "HISTORY__ACTION_ADD_STARPASS_OFFER": "Добавление предложения StarPass",
-       "HISTORY__ACTION_DELETE_PAYPAL_OFFER": "Удаление предложения PayPal",
-       "HISTORY__ACTION_DELETE_STARPASS_OFFER": "Удаление предложения StarPass",
-       "HISTORY__ACTION_EDIT_PAYPAL_OFFER": "Изменение предложения PayPal",
-       "HISTORY__ACTION_EDIT_STARPASS_OFFER": "Изменение предложения StarPass",
-       "HISTORY__ACTION_ENABLE_PAYSAFECARD": "Активация способа оплаты PaySafeCard",
-       "HISTORY__ACTION_DISABLE_PAYSAFECARD": "Отключение метода оплаты PaySafeCard",
-       "HISTORY__ACTION_ADD_PAYSAFECARD": "Добавление PaySafeCard"
+	"HISTORY__CATEGORY_SHOP": "Магазин",
+	"HISTORY__CATEGORY_CREDIT_SHOP": "Кредитование магазина",
+	"HISTORY__ACTION_VALID_PAYSAFECARD": "Проверка PaySafeCard",
+	"HISTORY__ACTION_DELETE_VOUCHER": "Подавление промокода",
+	"HISTORY__ACTION_ADD_VOUCHER": "Добавление промо-кода",
+	"HISTORY__ACTION_BUY_MONEY_DEDIPASS": "Покупка кредитов Dedipass",
+	"HISTORY__ACTION_EDIT_DEDIPASS_CONFIG": "Изменение конфигурации Dedipass",
+	"HISTORY__ACTION_DELETE_ITEM": "Удаление товара из магазина",
+	"HISTORY__ACTION_ADD_ITEM": "Добавить статью о магазине",
+	"HISTORY__ACTION_ADD_CATEGORY": "Добавить категорию в магазин",
+	"HISTORY__ACTION_BUY_ITEM": "Покупка",
+	"HISTORY__ACTION_BUY_MONEY": "Покупка торговых точек",
+	"HISTORY__ACTION_SEND_MONEY": "Отправить деньги",
+	"HISTORY__ACTION_ADD_PAYPAL_OFFER": "Добавление предложения PayPal",
+	"HISTORY__ACTION_ADD_NANO_OFFER": "Добавление нано-предложения",
+	"HISTORY__ACTION_ADD_STARPASS_OFFER": "Добавление предложения StarPass",
+	"HISTORY__ACTION_DELETE_PAYPAL_OFFER": "Удаление предложения PayPal",
+	"HISTORY__ACTION_DELETE_STARPASS_OFFER": "Удаление предложения StarPass",
+	"HISTORY__ACTION_EDIT_PAYPAL_OFFER": "Изменение предложения PayPal",
+	"HISTORY__ACTION_EDIT_STARPASS_OFFER": "Изменение предложения StarPass",
+	"HISTORY__ACTION_ENABLE_PAYSAFECARD": "Активация способа оплаты PaySafeCard",
+	"HISTORY__ACTION_DISABLE_PAYSAFECARD": "Отключение метода оплаты PaySafeCard",
+	"HISTORY__ACTION_ADD_PAYSAFECARD": "Добавление PaySafeCard"
 }

From d9796be9bf05c2af8e4a85b99cd7b42ac448b79b Mon Sep 17 00:00:00 2001
From: Ivan Karnauh <vanka2929@gmail.com>
Date: Sat, 28 Aug 2021 20:30:49 +0300
Subject: [PATCH 43/45] Improving Russian translation (#67)

---
 lang/ru_RU.json | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/lang/ru_RU.json b/lang/ru_RU.json
index a0be1d8..5c3f280 100644
--- a/lang/ru_RU.json
+++ b/lang/ru_RU.json
@@ -174,14 +174,24 @@
 	"SHOP__CATEGORY_EDIT_SUCCESS": "Категория успешно изменена!",
 	"SHOP__CATEGORY_DELETE_SUCCESS": "Категория успешно удалена!",
 	"SHOP__CATEGORY_NUMBER": "Количество статей, связанных с категорией",
+	"SHOP__CATEGORY_EDIT_MESSAGE": "Если у вас нет разделов, сначала создайте его здесь: ",
+	"SHOP__CATEGORY_EDIT": "Редактировать категорию",
+	"SHOP__ITEM_DUPLICATE_SUCCESS": "Статья успешно дублирована!",
+	"SHOP__CONFIRM_DUPLICATE": "Вы действительно хотите дублировать эту статью?",
+	"SHOP__SECTION_DELETE_SUCCESS": "Раздел успешно удалён!",
 	
-	"SHOP__CATEGORIES_TIP": "",
-	"SHOP__SECTION_TIP": "",
-	"SHOP__SECTION": "Разделы",
+	"SHOP__CATEGORIES_TIP": "Если функция доступна в теме, категории, помещенные в 'не включенный в список', не будут отображаться на странице магазина. Они должны быть отнесены к разделу. И категории, которые не будут связаны с разделом, не будут в виде раскрывающихся меню.",
+	"SHOP__CATEGORY_ADD_NO": "Не связывать категорию с разделом (это будет кнопка, а не раскрывающееся меню)",
+	
+	"SHOP__SECTION_TIP": "Внимание, эта функция доступна не для всех тем, однако использование категорий остается возможным, если вы решите не ссылаться на раздел. Разделы используются для создания раскрывающихся меню с содержащимися в них категориями.",
+	"SHOP__SECTION": "Раздел",
 	"SHOP__SECTION_AND_CATEGORIES": "РАЗДЕЛЫ И КАТЕГОРИИ",
-	"SHOP__SECTIONS": "Раздел",
+	"SHOP__SECTIONS": "Разделы",
 	"SHOP__CATEGORIES_NO": "Без категории",
 	"SHOP__CATEGORIES_OTHER":"Прочие категории",
+	"SHOP__SECTION_ADD": "Добавить раздел",
+	"SHOP__SECTION_EDIT_SUCCESS": "Раздел успешно изменен!",
+	"SHOP__SECTION_ADD_SUCCESS": "Раздел успешно добавлен!",
 
 	"SHOP__BUY": "Купить",
 	"SHOP__BUY_CART": "Посмотреть мою корзину",

From 5ddcb772cae2de8705cb2c8afbc5d5f621287c62 Mon Sep 17 00:00:00 2001
From: Sytorex <68004414+Sytorex-pro@users.noreply.github.com>
Date: Wed, 13 Jul 2022 18:48:28 +0200
Subject: [PATCH 44/45] improv. fix issue with jquery 3.6.0 (#70)

---
 View/Shop/index.ctp | 194 ++++++------
 webroot/js/shop.js  | 707 ++++++++++++++++++--------------------------
 2 files changed, 381 insertions(+), 520 deletions(-)

diff --git a/View/Shop/index.ctp b/View/Shop/index.ctp
index eca5235..7145a2b 100755
--- a/View/Shop/index.ctp
+++ b/View/Shop/index.ctp
@@ -1,97 +1,85 @@
 <?= $this->Html->css('Shop.shop-homepage.css') ?>
 <?= $this->Html->css('Shop.jquery.bootstrap-touchspin.css') ?>
 <div class="container plugin-shop">
-  <div class="row">
-    <div class="col-md-3">
-      <p class="lead"><?= ($isConnected) ? $money: $Lang->get('SHOP__TITLE'); ?></p>
-        <div class="list-group">
-            <ul class="nav">
-                <?php foreach ($search_sections as $v) { ?>
-                    <li class="dropdown" style="padding-bottom: 0px;padding-top: 0px;">
-                        <a style="padding-left: 15px;" href="#" class="dropdown-toggle list-group-item" data-toggle="dropdown" role="button" aria-expanded="false"><?= before_display($v['Section']['name']) ?> <span class="caret"></span></a>
-                        <ul class="dropdown-menu" role="menu">
-                        <?php foreach ($search_categories_section[$v['Section']['id']] as $va) { ?>
-                            <li><a href="<?= $this->Html->url(array('controller' => 'c/'.$va['Category']['id'], 'plugin' => 'shop')) ?>"><?= before_display($va['Category']['name']) ?></a></li>
-                        <?php } ?>
-                        </ul>
-                    </li>
-                <?php } ?>
-                <?php foreach ($search_categories_without_section as $v) { ?>
-                    <a href="<?= $this->Html->url(array('controller' => 'c/'.$v['Category']['id'], 'plugin' => 'shop')) ?>" class="list-group-item<?= (isset($category) AND $v['Category']['id'] == $category OR !isset($category) AND $i == 1) ? ' active' : ''; ?>"><?= before_display($v['Category']['name']) ?></a>
-                <?php } ?>
-            </ul>
-        </div>
-        <?php if($isConnected AND $Permissions->can('CREDIT_ACCOUNT')) { ?>
-          <?php if (!empty($goal_money_max)) {?>
-            <hr>
-            <h4><?= $Lang->get('SHOP__CONFIG_GOAL_TITLE') ?></h4>
-            <div class="progress">
-              <div class="progress-bar-info text-center" role="progressbar" style="width:<?= $goal_bar_with ?>%">
-                <b><?= $goal_bar_with ?>%</b>
-              </div>
+    <div class="row">
+        <div class="col-md-3">
+            <p class="lead"><?= ($isConnected) ? $money: $Lang->get('SHOP__TITLE'); ?></p>
+                <div class="list-group">
+                <ul class="nav">
+                    <?php foreach ($search_sections as $v) { ?>
+                        <li class="dropdown" style="padding-bottom: 0px;padding-top: 0px;">
+                            <a style="padding-left: 15px;" href="#" class="dropdown-toggle list-group-item" data-toggle="dropdown" role="button" aria-expanded="false"><?= before_display($v['Section']['name']) ?> <span class="caret"></span></a>
+                            <ul class="dropdown-menu" role="menu">
+                            <?php foreach ($search_categories_section[$v['Section']['id']] as $va) { ?>
+                                <li><a href="<?= $this->Html->url(['controller' => 'c/'.$va['Category']['id'], 'plugin' => 'shop']) ?>"><?= before_display($va['Category']['name']) ?></a></li>
+                            <?php } ?>
+                            </ul>
+                        </li>
+                    <?php } ?>
+                    <?php foreach ($search_categories_without_section as $v) { ?>
+                        <a href="<?= $this->Html->url(['controller' => 'c/'.$v['Category']['id'], 'plugin' => 'shop']) ?>" class="list-group-item<?= (isset($category) AND $v['Category']['id'] == $category OR !isset($category) AND $i == 1) ? ' active' : ''; ?>"><?= before_display($v['Category']['name']) ?></a>
+                    <?php } ?>
+                </ul>
             </div>
-            <hr>
-          <?php } ?>
-            <a href="#" data-toggle="modal" data-target="#addmoney" class="btn btn-success btn-block pull-right"><?= $Lang->get('SHOP__ADD_MONEY') ?></a>
-        <?php } ?>
+            <?php if($isConnected AND $Permissions->can('CREDIT_ACCOUNT')) { ?>
+                <?php if (!empty($goal_money_max)) {?>
+                    <hr>
+                    <h4><?= $Lang->get('SHOP__CONFIG_GOAL_TITLE') ?></h4>
+                    <div class="progress">
+                        <div class="progress-bar-info text-center" role="progressbar" style="width:<?= $goal_bar_with ?>%">
+                            <b><?= $goal_bar_with ?>%</b>
+                        </div>
+                    </div>
+                    <hr>
+                <?php } ?>
+                <a href="#" data-toggle="modal" data-target="#addmoney" class="btn btn-success btn-block pull-right"><?= $Lang->get('SHOP__ADD_MONEY') ?></a>
+            <?php } ?>
         <?php if($isConnected) { ?>
-          <a href="#" data-toggle="modal" data-target="#cart-modal" class="btn btn-primary btn-block pull-right"><?= $Lang->get('SHOP__BUY_CART') ?></a>
+            <a href="#" data-toggle="modal" data-target="#cart-modal" class="btn btn-primary btn-block pull-right"><?= $Lang->get('SHOP__BUY_CART') ?></a>
         <?php } ?>
       </div>
       <div class="col-xs-12 col-md-9">
-        <div class="row">
-          <?= $vouchers->get_vouchers() // Les promotions en cours ?>
-        </div>
-
-        <div class="row">
-          <?php
-          $col = 4;
-          $i = 0;
-		foreach ($search_items as $k => $v) {
-            if(!isset($category) AND $v['Item']['category'] == $search_first_category OR isset($category) AND $v['Item']['category'] == $category) {
-              $i++;
-              $newRow = ( ( $i % ( (12 / $col) ) ) == 0);
-          ?>
-                <div class="col-sm-<?= $col ?> col-lg-<?= $col ?> col-md-<?= $col ?>">
-                    <div class="thumbnail">
-                        <?php if(isset($v['Item']['img_url'])) { ?><img src="<?= $v['Item']['img_url'] ?>" alt=""><?php } ?>
-                        <div class="caption" style="height:auto;">
-                            <h4 class="pull-right"><?= $v['Item']['price'] ?><?php if($v['Item']['price'] == 1) { echo  ' '.$singular_money; } else { echo  ' '.$plural_money; } ?></h4>
-                            <h4><a href="#"><?= before_display($v['Item']['name']) ?></a>
-                            </h4>
-                            <p><?=
-                            $this->Text->truncate(
-                              strip_tags($v['Item']['description']),
-                              140,
-                              array('ellipsis' => '...', 'html' => true)
-                            )
-                            ?></p>
-                            <?php if($isConnected AND $Permissions->can('CAN_BUY')) { ?><button class="btn btn-success pull-right display-item" data-item-id="<?= $v['Item']['id'] ?>"><?= $Lang->get('SHOP__BUY') ?></button> <?php } ?>
+            <div class="row"><?= $vouchers->get_vouchers() // Current promotions ?></div>
+            <div class="row">
+            <?php
+                $col = 4;
+                $i = 0;
+                foreach ($search_items as $k => $v) {
+                    if(!isset($category) AND $v['Item']['category'] == $search_first_category OR isset($category) AND $v['Item']['category'] == $category) {
+                        $i++;
+                        $newRow = ( ( $i % ( (12 / $col) ) ) == 0); ?>
+                        <div class="col-sm-<?= $col ?> col-lg-<?= $col ?> col-md-<?= $col ?>">
+                            <div class="thumbnail">
+                                <?php if(isset($v['Item']['img_url'])) { ?><img src="<?= $v['Item']['img_url'] ?>" alt=""><?php } ?>
+                                <div class="caption" style="height:auto;">
+                                    <h4 class="pull-right"><?= $v['Item']['price'] ?><?php if($v['Item']['price'] == 1) { echo  ' '.$singular_money; } else { echo  ' '.$plural_money; } ?></h4>
+                                    <h4><a href="#"><?= before_display($v['Item']['name']) ?></a></h4>
+                                    <p><?= $this->Text->truncate(strip_tags($v['Item']['description']), 140, ['ellipsis' => '...', 'html' => true]) ?></p>
+                                    <?php if($isConnected AND $Permissions->can('CAN_BUY')) { ?><button class="btn btn-success pull-right display-item" data-item-id="<?= $v['Item']['id'] ?>"><?= $Lang->get('SHOP__BUY') ?></button> <?php } ?>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
-
-              <?= ($newRow) ? '</div>' : '' ?>
-              <?= ($newRow) ? '<div class="row">' : '' ?>
-            <?php } ?>
-          <?php } ?>
+                        <?= ($newRow) ? '</div>' : '' ?>
+                        <?= ($newRow) ? '<div class="row">' : '' ?>
+                    <?php } ?>
+                <?php } ?>
+            </div>
         </div>
     </div>
-  </div>
 </div>
 
 <script type="text/javascript">
-  var LOADING_MSG = '<?= $Lang->get('GLOBAL__LOADING') ?>';
-  var ADDED_TO_CART_MSG = '<?= $Lang->get('SHOP__BUY_ADDED_TO_CART') ?> <i class="fa fa-check"></i>';
-  var CART_EMPTY_MSG = '<?= $Lang->get('SHOP__BUY_CART_EMPTY') ?>';
-  var ITEM_GET_URL = '<?= $this->Html->url(array('controller' => 'shop/ajax_get', 'plugin' => 'shop')); ?>/';
-  var VOUCHER_CHECK_URL = '<?= $this->Html->url(array('action' => 'checkVoucher')) ?>/';
-  var BUY_URL = '<?= $this->Html->url(array('action' => 'buy_ajax')) ?>';
+    var LOADING_MSG = '<?= $Lang->get('GLOBAL__LOADING') ?>';
+    var ADDED_TO_CART_MSG = '<?= $Lang->get('SHOP__BUY_ADDED_TO_CART') ?> <i class="fa fa-check"></i>';
+    var CART_EMPTY_MSG = '<?= $Lang->get('SHOP__BUY_CART_EMPTY') ?>';
+    var ITEM_GET_URL = '<?= $this->Html->url(['controller' => 'shop/ajax_get', 'plugin' => 'shop']); ?>/';
+    var VOUCHER_CHECK_URL = '<?= $this->Html->url(['action' => 'checkVoucher']) ?>/';
+    var BUY_URL = '<?= $this->Html->url(['action' => 'buy_ajax']) ?>';
 
-  var CART_ITEM_NAME_MSG = '<?= $Lang->get('SHOP__ITEM_NAME') ?>';
-  var CART_ITEM_PRICE_MSG = '<?= $Lang->get('SHOP__ITEM_PRICE') ?>';
-  var CART_ITEM_QUANTITY_MSG = '<?= $Lang->get('SHOP__ITEM_QUANTITY') ?>';
-  var CART_ACTIONS_MSG = '<?= $Lang->get('GLOBAL__ACTIONS') ?>';
+    var CART_ITEM_NAME_MSG = '<?= $Lang->get('SHOP__ITEM_NAME') ?>';
+    var CART_ITEM_PRICE_MSG = '<?= $Lang->get('SHOP__ITEM_PRICE') ?>';
+    var CART_ITEM_QUANTITY_MSG = '<?= $Lang->get('SHOP__ITEM_QUANTITY') ?>';
+    var CART_ACTIONS_MSG = '<?= $Lang->get('GLOBAL__ACTIONS') ?>';
 
   var CSRF_TOKEN = '<?= $csrfToken ?>';
 </script>
@@ -99,34 +87,34 @@
 <?= $this->Html->script('Shop.shop') ?>
 <?= $this->Html->script('Shop.jquery.bootstrap-touchspin.js') ?>
 <div class="modal fade" id="buy-modal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-        <h4 class="modal-title"><?= $Lang->get('SHOP__BUY_CONFIRM') ?></h4>
-      </div>
-      <div class="modal-body">
-      </div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                <h4 class="modal-title"><?= $Lang->get('SHOP__BUY_CONFIRM') ?></h4>
+            </div>
+            <div class="modal-body">
+            </div>
+        </div>
     </div>
-  </div>
 </div>
 <div class="modal fade" id="cart-modal" tabindex="-1" role="dialog">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-        <h4 class="modal-title"><?= $Lang->get('SHOP__BUY_CART') ?></h4>
-      </div>
-      <div class="modal-body">
-      </div>
-      <div class="modal-footer">
-        <div class="pull-left">
-          <input name="cart-voucher" type="text" class="form-control" autocomplete="off" id="cart-voucher" style="width:245px;" placeholder="<?= $Lang->get('SHOP__BUY_VOUCHER_ASK') ?>">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                <h4 class="modal-title"><?= $Lang->get('SHOP__BUY_CART') ?></h4>
+            </div>
+            <div class="modal-body">
+            </div>
+            <div class="modal-footer">
+                <div class="pull-left">
+                <input name="cart-voucher" type="text" class="form-control" autocomplete="off" id="cart-voucher" style="width:245px;" placeholder="<?= $Lang->get('SHOP__BUY_VOUCHER_ASK') ?>">
+                </div>
+                <button class="btn disabled"><?= $Lang->get('SHOP__ITEM_TOTAL') ?> : <span id="cart-total-price">0</span>  <?= $Configuration->getMoneyName() ?></button>
+                <button type="button" class="btn btn-primary" id="buy-cart"><?= $Lang->get('SHOP__BUY') ?></button>
+            </div>
         </div>
-        <button class="btn disabled"><?= $Lang->get('SHOP__ITEM_TOTAL') ?> : <span id="cart-total-price">0</span>  <?= $Configuration->getMoneyName() ?></button>
-        <button type="button" class="btn btn-primary" id="buy-cart"><?= $Lang->get('SHOP__BUY') ?></button>
-      </div>
     </div>
-  </div>
 </div>
 <?= $this->element('payments_modal') ?>
diff --git a/webroot/js/shop.js b/webroot/js/shop.js
index 879e30b..fbdf8b5 100755
--- a/webroot/js/shop.js
+++ b/webroot/js/shop.js
@@ -1,462 +1,335 @@
-/*
-Afficher un article dans le modal
-*/
-
+// Show an item in the modal //
 $('.display-item').click(function(e) {
+    e.preventDefault();
 
-  e.preventDefault();
-
-  var id = $(this).attr('data-item-id'); // On récupère l'ID
-
-  var loading_html = '<div class="alert alert-info">';
-    loading_html += LOADING_MSG+'...';
-  loading_html += '</div>';
-
-  $('#buy-modal .modal-body').html(loading_html); // On met le message de chargement dans le modal
-
-
-  $('#buy-modal').modal(); // On affiche le modal en dernier
-
-  $.ajax({
-    url: ITEM_GET_URL+id,
-    type : 'GET',
-    dataType : 'json',
-    success: function(response) {
-      $('#buy-modal .modal-body').fadeOut(150, function(){
-
-        if(response.statut) {
-
-          $(this).html(response.html).fadeIn('250');
-
-          var item_infos = response.item_infos;
-
-          $.cookie.json = true; // Pouvoir mettre des objets
+    var id = $(this).attr('data-item-id'); // We get ID of the item
+    var loading_html = '<div class="alert alert-info">' + LOADING_MSG + '...' + '</div>';
 
-          /*
-            Si l'article est déjà dans le panier
-          */
-          var itemsInCart = $.cookie('cart');
-          for (var key in itemsInCart) {
-            if (itemsInCart[key] !== null && itemsInCart[key]['item_id'] == id) { // Si il est déjà dans le panier
-              $(this).find('button.add-to-cart').html(ADDED_TO_CART_MSG);
-              $(this).find('button.add-to-cart').addClass('disabled');
-              $(this).find('button.add-to-cart').attr('disabled', 'disabled');
+    $('#buy-modal .modal-body').html(loading_html); // We put the loading message in the modal
+    $('#buy-modal').modal(); // We display the modal last
 
-              break;
-            }
-          }
-
-          /*
-            On gère la quantité
-          */
-          $("input[name='quantity']").TouchSpin({
-            min: 0,
-            max: 100,
-            step: 1,
-            decimals: 0,
-            boostat: 5,
-            maxboostedstep: 10
-          });
-
-          $("input[name='quantity']").unbind('change');
-
-          $("input[name='quantity']").on('change', function(e) {
-
-            var code = $('input[id="code-voucher"]').val();
-
-            if(code.length == 0) { //si y'a pas de code promo
-              var new_price = item_infos['price'] * $(this).val();
-              $("#buy-modal .modal-body").find('#total-price').html(new_price);
-            } else { // si y'a un code promo - on re-calcule le prix selon la quantité
-
-              var quantity = $(this).val();
-              if(quantity == undefined) {
-                quantity = 1;
-              }
-              $.get(VOUCHER_CHECK_URL+code+'/'+id+'/'+quantity, function(data) {
-                if(data.price !== undefined) {
-                  $("#buy-modal .modal-body").find('#total-price').html(data.price);
+    $.ajax({
+        url: ITEM_GET_URL + id,
+        type: 'GET',
+        dataType: 'json',
+        success: function(response) {
+            $('#buy-modal .modal-body').fadeOut(150, function() {
+                if (!response.statut) $(this).html(response.html).fadeIn('250');
+                $(this).html(response.html).fadeIn('250');
+
+                var item_infos = response.item_infos;
+
+                $.cookie.json = true; // Ability to put objects
+
+                // If the item is already in the cart
+                var itemsInCart = $.cookie('cart');
+                for (var key in itemsInCart) {
+                    if (itemsInCart[key] !== null && itemsInCart[key]['item_id'] == id) { // If it is already in the basket
+                        $(this).find('button.add-to-cart').html(ADDED_TO_CART_MSG);
+                        $(this).find('button.add-to-cart').addClass('disabled');
+                        $(this).find('button.add-to-cart').attr('disabled', 'disabled');
+                        break;
+                    }
                 }
-              });
-
-            }
 
-          });
+                // Quantity
+                $("input[name='quantity']").TouchSpin({
+                    min: 1,
+                    max: 100,
+                    step: 1,
+                    decimals: 0,
+                    boostat: 5,
+                    maxboostedstep: 10
+                });
+                $("input[name='quantity']").unbind('change');
+                $("input[name='quantity']").on('change', function(e) {
+
+                    var code = $('input[id="code-voucher"]').val();
+
+                    if (code.length == 0) { // if there is no promo code
+                        var new_price = item_infos['price'] * $(this).val();
+                        $("#buy-modal .modal-body").find('#total-price').html(new_price);
+
+                    } else { // if there is a promo code - we re-calculate the price according to the quantity
+                        var quantity = ($(this).val() == undefined) ? 1 : $(this).val();
+                        $.get(VOUCHER_CHECK_URL + code + '/' + id + '/' + quantity, function(data) {
+                            if (data.price !== undefined) $("#buy-modal .modal-body").find('#total-price').html(data.price);
+                        });
+                    }
+                });
+
+                // Promo codes
+                $('input[id="code-voucher"]').unbind('keyup');
+                $('input[id="code-voucher"]').keyup(function(e) {
+                    $("#buy-modal .modal-footer").find('#total-price').html('<small>' + LOADING_MSG.substr(0, 4) + '...</small>');
+                    $("#buy-modal .modal-footer").find('#btn-buy').addClass('disabled').attr('disabled', true);
+
+                    var code = $(this).val();
+                    var quantity = ($("input[name='quantity']").val() == undefined) ? 1 : $("input[name='quantity']").val();
+                    if (code.length > 0) {
+                        $.get(VOUCHER_CHECK_URL + code + '/' + id + '/' + quantity, function(data) {
+                            if (data.price !== undefined) $("#buy-modal .modal-body").find('#total-price').html(data.price);
+                            $("#buy-modal .modal-footer").find('#btn-buy').removeClass('disabled').attr('disabled', false);
+                        });
+
+                    } else { // if there is no promo code
+                        var new_price = item_infos['price'] * quantity;
+                        $("#buy-modal .modal-body").find('#total-price').html(new_price);
+                        $("#buy-modal .modal-footer").find('#btn-buy').removeClass('disabled').attr('disabled', false);
+                    }
+                });
+
+                // Item purchase
+                $('.buy-item').unbind('click');
+                $('.buy-item').click(function(e) {
+                    e.preventDefault();
+
+                    var id = $(this).attr('data-item-id');
+                    var quantity = ($("input[name='quantity']").val() == undefined) ? 1 : $("input[name='quantity']").val();
+                    var code = $('#code-voucher').val();
+
+                    if ($("#buy-modal .modal-body").find('#ajax-msg').length == 0) $("#buy-modal .modal-body").prepend('<div id="ajax-msg"></div>');
+
+                    $('#btn-buy').attr('disabled', true);
+                    $('#btn-buy').addClass('disabled');
+                    $("#buy-modal .modal-body").find('#ajax-msg').html('<div class="alert alert-info">' + LOADING_MSG + '...</div>').fadeIn('150');
+
+                    var post = {};
+                    post['items'] = [{
+                        item_id: id,
+                        quantity: quantity
+                    }];
+                    post['code'] = code;
+                    post["data[_Token][key]"] = CSRF_TOKEN;
+
+                    $.ajax({
+                        url: BUY_URL,
+                        data: post,
+                        type: 'post',
+                        dataType: 'JSON',
+                        success: function(response) {
+                            $('#btn-buy').attr('disabled', false);
+                            $('#btn-buy').removeClass('disabled');
+                            $("#buy-modal .modal-body").find('#ajax-msg').html('<div class="alert alert-' + (response.statut) ? 'success' : 'danger' + '">' + response.msg + '</div>').fadeIn('150');
+                        },
+                        error: function(xhr) {
+                            $('#btn-buy').attr('disabled', false);
+                            $('#btn-buy').removeClass('disabled');
+                            $("#buy-modal .modal-body").find('#ajax-msg').fadeOut(150);
+                            alert('ERROR');
+                        }
+                    });
+
+                });
+
+                // Add to cart
+                $('.add-to-cart').unbind('click');
+                $('.add-to-cart').click(function(e) {
+                    e.preventDefault();
+
+                    var id = $(this).attr('data-item-id');
+                    var cookie = $.cookie('cart');
+                    var cart = (typeof(cookie) !== 'object' || cookie === undefined) ? [] : cookie;
+                    var item_id = $(this).attr('data-item-id');
+                    var quantity = ($("input[name='quantity']").val() == undefined) ? 1 : $("input[name='quantity']").val();
+                    var item_name = item_infos['name'];
+                    var item_price = item_infos['price'];
+
+                    cart.push({
+                        'item_id': item_id,
+                        'quantity': quantity,
+                        'item_name': item_name,
+                        'item_price': item_price
+                    });
+
+                    $.cookie('cart', cart);
+
+                    $(this).html(ADDED_TO_CART_MSG);
+                    $(this).addClass('disabled');
+                    $(this).attr('disabled', 'disabled');
+
+                    refreshCart();
+
+                });
 
-          /*
-           On gère les codes promos
-          */
-
-          $('input[id="code-voucher"]').unbind('keyup');
-
-          $('input[id="code-voucher"]').keyup(function(e) {
-
-            $("#buy-modal .modal-footer").find('#total-price').html('<small>'+LOADING_MSG.substr(0, 4)+'...</small>');
-            $("#buy-modal .modal-footer").find('#btn-buy').addClass('disabled').attr('disabled', true);
-
-            var code = $(this).val();
-            var quantity = $("input[name='quantity']").val();
-            if(quantity == undefined) {
-              quantity = 1;
-            }
-
-            if(code.length > 0) {
-
-              $.get(VOUCHER_CHECK_URL+code+'/'+id+'/'+quantity, function(data) {
-                if(data.price !== undefined) {
-                  $("#buy-modal .modal-body").find('#total-price').html(data.price);
-                }
-
-                $("#buy-modal .modal-footer").find('#btn-buy').removeClass('disabled').attr('disabled', false);
-              });
+            });
+        },
+        error: function(xhr) {
+            console.log('Shop : We have an error with your ajax request')
+            $('#buy-modal').modal('hide');
+        }
+    });
+});
 
-            } else { // y'a pas de code
-              var new_price = item_infos['price'] * quantity;
-              $("#buy-modal .modal-body").find('#total-price').html(new_price);
+// Load my basket //
+$(window).on('load', function() {
+    refreshCart();
 
-              $("#buy-modal .modal-footer").find('#btn-buy').removeClass('disabled').attr('disabled', false);
+    // Buy basket //
+    $('#cart-modal .modal-footer #buy-cart').click(function(e) {
 
-            }
-          });
+        if ($("#cart-modal .modal-body").find('#ajax-msg').length == 0) $("#cart-modal .modal-body").prepend('<div id="ajax-msg"></div>');
 
-          /*
-            On gère l'achat d'article
-          */
-          $('.buy-item').unbind('click');
-          $('.buy-item').click(function(e) {
+        $('#buy-cart').attr('disabled', true);
+        $('#buy-cart').addClass('disabled');
 
-            e.preventDefault();
+        $("#cart-modal .modal-body").find('#ajax-msg').html('<div class="alert alert-info">' + LOADING_MSG + '...</div>').fadeIn('150');
 
-            var id = $(this).attr('data-item-id');
+        var items = $.cookie('cart');
 
-            var quantity = $("input[name='quantity']").val();
-            if(quantity == undefined) {
-              quantity = 1;
-            }
+        var post = {};
+        post['items'] = items;
+        post['code'] = $('#cart-voucher').val();
+        post["data[_Token][key]"] = CSRF_TOKEN;
 
-            var code = $('#code-voucher').val();
+        $.ajax({
+            url: BUY_URL,
+            data: post,
+            type: 'post',
+            dataType: 'JSON',
+            success: function(response) {
+                $('#buy-cart').attr('disabled', false);
+                $('#buy-cart').removeClass('disabled');
 
-            if($("#buy-modal .modal-body").find('#ajax-msg').length == 0) {
-              $("#buy-modal .modal-body").prepend('<div id="ajax-msg"></div>');
-            }
-
-            $('#btn-buy').attr('disabled', true);
-            $('#btn-buy').addClass('disabled');
-
-            $("#buy-modal .modal-body").find('#ajax-msg').html('<div class="alert alert-info">'+LOADING_MSG+'...</div>').fadeIn('150');
-
-            var post = {};
-            post['items'] = [
-              {
-                item_id: id,
-                quantity: quantity
-              }
-            ];
-            post['code'] = code;
-            post["data[_Token][key]"] = CSRF_TOKEN;
-
-            $.ajax({
-              url: BUY_URL,
-              data : post,
-              type : 'post',
-              dataType : 'JSON',
-              success: function(response) {
-
-                if(response.statut) {
-                  $('#btn-buy').attr('disabled', false);
-                  $('#btn-buy').removeClass('disabled');
-
-                  $("#buy-modal .modal-body").find('#ajax-msg').html('<div class="alert alert-success">'+response.msg+'</div>').fadeIn('150');
+                if (response.statut) {
+                    $.cookie('cart', []); // We delete the basket
+                    refreshCart(response.msg);
                 } else {
-                  $('#btn-buy').attr('disabled', false);
-                  $('#btn-buy').removeClass('disabled');
-
-                  $("#buy-modal .modal-body").find('#ajax-msg').html('<div class="alert alert-danger">'+response.msg+'</div>').fadeIn('150');
+                    $("#cart-modal .modal-body").find('#ajax-msg').html('<div class="alert alert-danger">' + response.msg + '</div>').fadeIn('150');
                 }
-              },
-              error: function(xhr) {
-                $('#btn-buy').attr('disabled', false);
-                $('#btn-buy').removeClass('disabled');
-                $("#buy-modal .modal-body").find('#ajax-msg').fadeOut(150);
+            },
+            error: function(xhr) {
+                $('#buy-cart').attr('disabled', false);
+                $('#buy-cart').removeClass('disabled');
+                $("#cart-modal .modal-body").find('#ajax-msg').fadeOut(150);
                 alert('ERROR');
-              }
-            });
-
-          });
-
-          /*
-            On gère l'ajout au panier
-          */
-          $('.add-to-cart').unbind('click');
-          $('.add-to-cart').click(function(e) {
-
-            e.preventDefault();
-
-            var id = $(this).attr('data-item-id');
-
-            var cookie = $.cookie('cart');
-            if(typeof(cookie) !== 'object' || cookie === undefined) {
-              var cart = [];
-            } else {
-              var cart = cookie;
             }
-
-            console.log(cart);
-
-            var item_id = $(this).attr('data-item-id');
-
-            var quantity = $("input[name='quantity']").val();
-            if(quantity === undefined) {
-              quantity = '1';
-            }
-
-            var item_name = item_infos['name'];
-            var item_price = item_infos['price'];
-
-            cart.push({
-              'item_id':item_id,
-              'quantity':quantity,
-              'item_name':item_name,
-              'item_price':item_price
-            });
-
-            console.log(cart);
-
-            $.cookie('cart', cart);
-
-            $(this).html(ADDED_TO_CART_MSG);
-            $(this).addClass('disabled');
-            $(this).attr('disabled', 'disabled');
-
-            refreshCart();
-
-          });
-
-        } else {
-          $(this).html(response.html).fadeIn('250');
-        }
-
-
-      });
-    },
-    error: function(xhr) {
-      $('#buy-modal').modal('hide');
-    }
-  });
-
-});
-
-/*
-Charger mon panier
-*/
-$(window).load(function() {
-
-  refreshCart();
-
-  /*
-    Acheter le panier
-  */
-  $('#cart-modal .modal-footer #buy-cart').click(function(e) {
-
-    if($("#cart-modal .modal-body").find('#ajax-msg').length == 0) {
-      $("#cart-modal .modal-body").prepend('<div id="ajax-msg"></div>');
-    }
-
-    $('#buy-cart').attr('disabled', true);
-    $('#buy-cart').addClass('disabled');
-
-    $("#cart-modal .modal-body").find('#ajax-msg').html('<div class="alert alert-info">'+LOADING_MSG+'...</div>').fadeIn('150');
-
-    var items = $.cookie('cart');
-
-    var post = {};
-    post['items'] = items;
-    post['code'] = $('#cart-voucher').val();
-    post["data[_Token][key]"] = CSRF_TOKEN;
-
-    $.ajax({
-      url: BUY_URL,
-      data : post,
-      type : 'post',
-      dataType : 'JSON',
-      success: function(response) {
-
-        if(response.statut) {
-          $('#buy-cart').attr('disabled', false);
-          $('#buy-cart').removeClass('disabled');
-
-          $.cookie('cart', []); // On supprime le panier
-          refreshCart();
-
-          if($("#cart-modal .modal-body").find('#ajax-msg').length == 0) { // le refresh a supprimé le ajax-msg
-            $("#cart-modal .modal-body").prepend('<div id="ajax-msg"></div>');
-          }
-
-          $("#cart-modal .modal-body").find('#ajax-msg').html('<div class="alert alert-success">'+response.msg+'</div>').fadeIn('150');
-        } else {
-          $('#buy-cart').attr('disabled', false);
-          $('#buy-cart').removeClass('disabled');
-
-          $("#cart-modal .modal-body").find('#ajax-msg').html('<div class="alert alert-danger">'+response.msg+'</div>').fadeIn('150');
-        }
-      },
-      error: function(xhr) {
-        $('#buy-cart').attr('disabled', false);
-        $('#buy-cart').removeClass('disabled');
-        $("#cart-modal .modal-body").find('#ajax-msg').fadeOut(150);
-        alert('ERROR');
-      }
+        });
     });
-
-  });
-
-
 });
 
-function refreshCart() {
-  $('#cart-modal .modal-body').html('<div class="alert alert-info">'+LOADING_MSG+'...</div>');
+function refreshCart(response_msg = false) {
+    $('#cart-modal .modal-body').html('<div class="alert alert-info">' + LOADING_MSG + '...</div>');
 
-  // On ouvre la table
-  var table = '<table class="table table-bordered">';
-  table += '<thead>';
+    // We open the table
+    var table = '<table class="table table-bordered">';
+    table += '<thead>';
     table += '<tr>';
-      table += '<th>'+CART_ITEM_NAME_MSG+'</th>';
-      table += '<th>'+CART_ITEM_PRICE_MSG+'</th>';
-      table += '<th>'+CART_ITEM_QUANTITY_MSG+'</th>';
-      table += '<th>'+CART_ACTIONS_MSG+'</th>';
+    table += '<th>' + CART_ITEM_NAME_MSG + '</th>';
+    table += '<th>' + CART_ITEM_PRICE_MSG + '</th>';
+    table += '<th>' + CART_ITEM_QUANTITY_MSG + '</th>';
+    table += '<th>' + CART_ACTIONS_MSG + '</th>';
     table += '</tr>';
-  table += '</thead>';
-  table += '<tbody>';
-
-  // On récupère les cookies
-  $.cookie.json = true;
-
-  var cart = $.cookie('cart');
-
-  var notEmpty = false;
-
-  var total = 0;
-
-  for (var key in cart) {
-
-    if(cart[key] !== null) {
-
-      notEmpty = true;
-
-      table += '<tr data-item-id="'+cart[key]['item_id']+'">';
-        table += '<td>'+cart[key]['item_name']+'</td>';
-        table += '<td>'+cart[key]['item_price']+'</td>';
-        table += '<td>'+cart[key]['quantity']+'</td>';
-        table += '<td><button class="btn btn-danger remove-from-cart" data-item-id="'+cart[key]['item_id']+'"><i class="fa fa-close"></i></button></td>';
-      table += '</tr>';
-
-      total += parseFloat(cart[key]['item_price']) * cart[key]['quantity'];
-
-    }
-
-  }
-
-  // On ferme la table
-  table += '</tbody>';
-  table += '</div>';
-
-  if(notEmpty) {
-    $('#cart-total-price').html(total);
-    $('#buy-cart').attr('disabled', false);
-    $('#buy-cart').removeClass('disabled');
-    $('#cart-modal .modal-body').html(table);
-  } else {
-    $('#cart-total-price').html('0');
-    $('#buy-cart').attr('disabled', true);
-    $('#buy-cart').addClass('disabled');
-    $('#cart-modal .modal-body').html('<div class="alert alert-danger">'+CART_EMPTY_MSG+'</div>');
-  }
-
-  // On gère la suppression
-  $('.remove-from-cart').unbind('click');
-  $('.remove-from-cart').click(function(e) {
-
-    e.preventDefault();
-
-    var cartContent = $.cookie('cart'); // on récupère le panier
-    var newCart = [];// le nouveau panier (pour éviter les values null)
-
-    var item_id = $(this).attr('data-item-id');
+    table += '</thead>';
+    table += '<tbody>';
 
+    // We get cookies
+    $.cookie.json = true;
+    var cart = $.cookie('cart');
+    var notEmpty = false;
     var total = 0;
 
-    for (var k in cartContent) {
-      if(cartContent[k] !== null && cartContent[k]['item_id'] != item_id) { // si c'est pas l'article qu'on cherche
-
-        newCart.push(cartContent[k]);
+    for (var key in cart) {
+        if (cart[key] !== null) {
+            notEmpty = true;
 
-        total += parseFloat(cartContent[k]['item_price']) * cartContent[k]['quantity'];
+            table += '<tr data-item-id="' + cart[key]['item_id'] + '">';
+            table += '<td>' + cart[key]['item_name'] + '</td>';
+            table += '<td>' + cart[key]['item_price'] + '</td>';
+            table += '<td>' + cart[key]['quantity'] + '</td>';
+            table += '<td><button class="btn btn-danger remove-from-cart" data-item-id="' + cart[key]['item_id'] + '"><i class="fa fa-close"></i></button></td>';
+            table += '</tr>';
 
-      }
+            total += parseFloat(cart[key]['item_price']) * cart[key]['quantity'];
+        }
     }
 
-    $.cookie('cart', newCart); // On le met dans les cookies maintenant
+    // We close the table
+    table += '</tbody>';
+    table += '</div>';
 
-    if(newCart.length > 0) {
-      $('#cart-total-price').html(total);
-      $('#cart-modal .modal-body').find('tr[data-item-id="'+item_id+'"]').slideUp(150); // On l'enlève de la table
+    if (notEmpty) {
+        $('#cart-total-price').html(total.toFixed(2));
+        $('#buy-cart').attr('disabled', false);
+        $('#buy-cart').removeClass('disabled');
+        $('#cart-modal .modal-body').html(table);
     } else {
-      $('#buy-cart').attr('disabled', true);
-      $('#buy-cart').addClass('disabled');
-      $('#cart-total-price').html('0');
-      $('#cart-modal .modal-body').html('<div class="alert alert-danger">'+CART_EMPTY_MSG+'</div>');
+        $('#cart-total-price').html('0');
+        $('#buy-cart').attr('disabled', true);
+        $('#buy-cart').addClass('disabled');
+        if (response_msg === false) {
+            $('#cart-modal .modal-body').html('<div class="alert alert-danger">' + CART_EMPTY_MSG + '</div>');
+        } else {
+            $("#cart-modal .modal-body").html('<div class="alert alert-success">' + response_msg + '</div>').fadeIn('150');
+        }
     }
 
-    newCart = undefined;
-
-  });
-
-  // on gère le code promo
-  $("input[name='cart-voucher']").unbind('keyup');
-  $("input[name='cart-voucher']").on('keyup', function(e) {
-
-    var code = $('input[name="cart-voucher"]').val();
+    // Removing an item from the cart
+    $('.remove-from-cart').unbind('click');
+    $('.remove-from-cart').click(function(e) {
+        e.preventDefault();
 
-    $("#cart-modal .modal-footer").find('#cart-total-price').html('<small>'+LOADING_MSG+'...</small>');
-    $("#cart-modal .modal-footer").find('#buy-cart').addClass('disabled').attr('disabled', true);
+        var cartContent = $.cookie('cart'); // we get the basket
+        var newCart = []; // the new basket (to avoid null values)
+        var item_id = $(this).attr('data-item-id');
+        var total = 0;
 
-    if(code.length == 0) { //si y'a pas de code promo
-
-      var total_price = 0;
-      var cartContent = $.cookie('cart');
-      for (var key in cartContent) {
-        i++;
-        total_price += cartContent[key]['item_price'] * cartContent[key]['quantity'];
-      }
-
-      $("#cart-modal .modal-footer").find('#buy-cart').removeClass('disabled').attr('disabled', false);
-
-      $("#cart-modal .modal-footer").find('#cart-total-price').html(total_price);
-    } else { // si y'a un code promo - on re-calcule le prix selon la quantité
-
-      var cartContent = $.cookie('cart');
-      var ids = '';
-      var quantities = '';
-      var i = 0;
-      for (var key in cartContent) {
-        i++;
-        ids += cartContent[key]['item_id'];
-        quantities += cartContent[key]['quantity'];
-        if(i < cartContent.length) {
-          ids += ',';
-          quantities += ',';
+        for (var k in cartContent) {
+            if (cartContent[k] !== null && cartContent[k]['item_id'] != item_id) { // if this is not the item you are looking for
+                newCart.push(cartContent[k]);
+                total += parseFloat(cartContent[k]['item_price']) * cartContent[k]['quantity'];
+            }
         }
-      }
 
-      $.get(VOUCHER_CHECK_URL+code+'/'+ids+'/'+quantities, function(data) {
-        if(data.price !== undefined) {
-          $("#cart-modal .modal-footer").find('#cart-total-price').html(data.price);
-        }
-        $("#cart-modal .modal-footer").find('#buy-cart').removeClass('disabled').attr('disabled', false);
-      });
+        $.cookie('cart', newCart); // We put it in the cookies now
 
-    }
+        if (newCart.length > 0) {
+            $('#cart-total-price').html(total.toFixed(2));
+            $('#cart-modal .modal-body').find('tr[data-item-id="' + item_id + '"]').slideUp(150); // We take it off the table
+        } else {
+            $('#buy-cart').attr('disabled', true);
+            $('#buy-cart').addClass('disabled');
+            $('#cart-total-price').html('0');
+            $('#cart-modal .modal-body').html('<div class="alert alert-danger">' + CART_EMPTY_MSG + '</div>');
+        }
+    });
 
-  });
+    // Promo code input
+    $("input[name='cart-voucher']").unbind('keyup');
+    $("input[name='cart-voucher']").on('keyup', function(e) {
+        var code = $('input[name="cart-voucher"]').val();
+
+        $("#cart-modal .modal-footer").find('#cart-total-price').html('<small>' + LOADING_MSG + '...</small>');
+        $("#cart-modal .modal-footer").find('#buy-cart').addClass('disabled').attr('disabled', true);
+
+        if (code.length == 0) { // if there is no promo code
+            var cartContent = $.cookie('cart');
+            var total_price = 0;
+            for (var key in cartContent) total_price += cartContent[key]['item_price'] * cartContent[key]['quantity'];
+
+            $("#cart-modal .modal-footer").find('#buy-cart').removeClass('disabled').attr('disabled', false);
+            $("#cart-modal .modal-footer").find('#cart-total-price').html(total_price.toFixed(2));
+
+        } else { // if there is a promo code - we re-calculate the price according to the quantity
+
+            var cartContent = $.cookie('cart');
+            var ids = '';
+            var quantities = '';
+            var i = 0;
+            for (var key in cartContent) {
+                i++;
+                ids += cartContent[key]['item_id'];
+                quantities += cartContent[key]['quantity'];
+                if (i < cartContent.length) {
+                    ids += ',';
+                    quantities += ',';
+                }
+            }
 
+            $.get(VOUCHER_CHECK_URL + code + '/' + ids + '/' + quantities, function(data) {
+                if (data.price !== undefined) $("#cart-modal .modal-footer").find('#cart-total-price').html(data.price.toFixed(2));
+                $("#cart-modal .modal-footer").find('#buy-cart').removeClass('disabled').attr('disabled', false);
+            });
+        }
+    });
 }

From 0a9798a5e4470be265899187feee7b5c30cbae77 Mon Sep 17 00:00:00 2001
From: nivcoo <36514752+nivcoo@users.noreply.github.com>
Date: Wed, 13 Jul 2022 18:49:24 +0200
Subject: [PATCH 45/45] bump. up to 1.3.3

---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.json b/config.json
index 37b5d11..f0705d1 100755
--- a/config.json
+++ b/config.json
@@ -37,7 +37,7 @@
 		"Boutique": "/shop"
 	},
 	"author":"Eywek",
-	"version":"1.3.2",
+	"version":"1.3.3",
 	"useEvents":true,
 	"permissions" : {
 		"available" : ["CREDIT_ACCOUNT", "CAN_BUY", "SHOP__ADMIN_MANAGE_ITEMS", "SHOP__ADMIN_MANAGE_CATEGORIES", "SHOP__ADMIN_MANAGE_VOUCHERS", "SHOP__ADMIN_MANAGE_PAYMENT", "SHOP__ADMIN_GIFTALL"],