diff --git a/rapports_iterations/iteration_2.md b/rapports_iterations/iteration_2.md
index 66066709f03579a3fd1b590adf72c6c11e692b7e..e9b346d0f20e30c0027cc455b075f3798fa20607 100644
--- a/rapports_iterations/iteration_2.md
+++ b/rapports_iterations/iteration_2.md
@@ -6,27 +6,26 @@
| | Itération précédente |
| ------------- |------------- |
| **Product Owner** | *AICHHORN Guillaume* |
-| **Scrum Master** | *MELCHIOR Louis* |
+| **Scrum Master** | *ALVES Alexandre* |
| **Dev** | *KIM Hyoseok* |
| **Dev** | *ALIMEHNNI Hugues* |
| **Dev** | *SANN Sokchivin* |
| **Dev** | *BENCHETRIT Milan* |
-| **Dev** | *ALVES Alexandre* |
+| **Dev** | *MELCHIOR Louis* |
## Bilan de l'itération précédente
### Évènements
*Quels sont les évènements qui ont marqué l'itération précédente? Répertoriez ici les évènements qui ont eu un impact sur ce qui était prévu à l'itération précédente.*
-> Guillaume n'avait pas accès à un ordinateur (problème lié à son ordinateur personnel)
-> L'équipe manquait d'organisation (manque de communication et tâches non définis)
-> Après réflexion, nous avons migrés sur Cloud9 (facilitant le travail parallèle)
+> Guillaume n'était pas très disponible du fait de sa participation aux élections du BDE
+> L'équipe manquait d'organisation et a donc eu du mal à se mettre au travail (tâches définies mais mal réparties)
### Taux de complétion de l'itération
*Quel est le nombre d'éléments terminés par rapport au nombre total d'éléments prévu pour l'itération?*
-> 2 terminées / 3 prévues = 66%
+> 4 terminées / 7 prévues = 57%
### Liste des User Stories terminées
-> Présentation général du site
-> Authentification
+> Dépot d'annonce
+> Affichage des annonces (ensemble et individuel)
## Rétrospective de l'itération précédente
@@ -34,29 +33,36 @@
> Manque d'organisations et de communication : les membres de l'équipe ne savait pas quoi faire
> Pas assez de stand up et état d'avancé du projet
> Les USs étaient trop vagues et n'avaient pas été étudiées
+> Mauvaise compréhension des membres de l'équipe.
> Difficultés à prendre en mains Laravel (nouvel environnement de travail)
### Actions prises pour la prochaine itération
-> Meilleure communication
+> Meilleure communication (plus de réunion)
> Meilleure plannification des tâches (répartition et objectifs)
+> US de plus petite taille.
+> Meilleur découpage des US.
> Nouvel axe de travail (recentré sur le MVP)
### Axes d'améliorations
> PO : Doit être plus investi dans les prises de décisions concernant l'orientation du projet
+> - Conception/modification d'US.
+> - Définir la valeur de chaque US.
> SM : Doit être un élement clé pour la cohésion et la communication au sein de l'équipe
+> - Moins animer les réunion mais doit maintenir l'égalité entre membres
> Dev : Doivent être plus présents dans la réalisation du projet, n'hésitant pas à faire part de leurs problèmes
## Prévisions de l'itération suivante
### Évènements prévus
-> Jeudi 9 Novembre 2017 : Forum de l'ENSIIE
-> Vendredi 10 Novembre 2017 : Réunion mi-sprint
-
+> Conférence vendredi après-midi (24/11)
+> Conférence mardi matin (28/11)
+>
### Titre des User Stories reportées
-> Réalisation du MVP (Dépose annonce et consultation)
+> Fin du MVP (update, suppression d'annonce, recherche simple)
### Titre des nouvelles User Stories
-> Recherche dans les annonces
> Les US reportées
+> Demande de réservation
+> Upload d'image
## Confiance
### Taux de confiance de l'équipe dans l'itération
@@ -64,14 +70,14 @@
| | :( | :| | :) | :D |
|:--------: |:----: |:----: |:----: |:----: |
-| Equipe 7 | *0* | *0* | *0* | *0* |
+| Equipe 7 | *0* | *3* | *4* | *0* |
### Taux de confiance de l'équipe pour la réalisation du projet
*Remplir le tableau sachant que :D est une confiance totale dans le fait de réaliser le projet. Mettre le nombre de votes dans chacune des cases. Expliquer en cas de besoin.*
| | :( | :| | :) | :D |
|:--------: |:----: |:----: |:----: |:----: |
-| Equipe 7 | *0* | *0* | *0* | *0* |
+| Equipe 7 | *0* | *1* | *4* | *1* |
diff --git a/workspace/.c9/metadata/workspace/Retro.2.md b/workspace/.c9/metadata/workspace/Retro.2.md
index ee184747a047fe2c4d9513ee07abecfbf4396b34..16336a95f3ecef80d44094db8eb7f779a48fc4b8 100644
--- a/workspace/.c9/metadata/workspace/Retro.2.md
+++ b/workspace/.c9/metadata/workspace/Retro.2.md
@@ -1 +1 @@
-{"changed":true,"filter":false,"title":"Retro.2.md","tooltip":"/Retro.2.md","value":"#Retro 2\n\nRevoir l'allure général du site car il n'est pas très propre. Revoir la mise en forme (Bootstrap).\nPing était pris par son mooc ces dernier temps et n'a pas pue beaucoup travailler. (Besoin de motivation pour le travail)\nRevoir l'évaluation du temps dans le trello et le partage du travail (Parp1). (Impliquer tout le monde dans le code)\nLa communication est meilleure, mais c'est à améliorer (pas assez de monde), prise en mains de Laravel difficile.\nBesoin de réunion plus souvent pour partager les difficultés.\n\n##Indice de satisfaction / Confiance\n\nSok :|\nPing :|\nParp1 :)\nMagis :)\nCartman :)\nMilan :)\nLDG ?\n\n##État de l'avancement\n\nRevoir l'affichage (Mise en forme : tableau :voir Magis).\nContinuer la barre de recherche.\nRevoir le texte dans index.\nFaire l'affichage des périmes bientôt.\nUtiliser les infos d'un user pour faciliter la dépose d'annonce.\n\nFaire une sorte de liste de réservation.\n(Un producteur doit être capable de voir toutes les demandes de réservation et un user doit être capable d'en demander)\n\n##Les dislike sur le produit\n\nManque de fonctionnalité\n\"Y a rien\"\nL'apprentissage de Laravel\n\n\n##Les likes\n\nC'est jolie\nLa puissance de Laravel\nCloud9\n\n##Autours du dev\n\n###Bon points\n\n\n###Mauvais points\n\n\n\nTraduire 2-3 truc (pour Laravel)\n\n###Problèmes rencontré (solutions)\n\nLDG absent\nPing avait du boulot (MOOC).\nMilan : temps d'apprentissage\nSok : ne comprend pas\n\n\n>Solution pour les dislike :\n\tAller voir LDG pour l'engueuler\n\tMilan doit demander plus d'aide\n\tRevoir les US pour qu'elles soient plus compréhensible (plus simple) par Sok.\n\tPlus de communication\n\t\n\n","undoManager":{"mark":100,"position":100,"stack":[[{"start":{"row":63,"column":27},"end":{"row":63,"column":28},"action":"insert","lines":["'"],"id":1462}],[{"start":{"row":63,"column":28},"end":{"row":63,"column":29},"action":"insert","lines":["a"],"id":1463}],[{"start":{"row":63,"column":29},"end":{"row":63,"column":30},"action":"insert","lines":["i"],"id":1464}],[{"start":{"row":63,"column":30},"end":{"row":63,"column":31},"action":"insert","lines":["d"],"id":1465}],[{"start":{"row":63,"column":31},"end":{"row":63,"column":32},"action":"insert","lines":["e"],"id":1466}],[{"start":{"row":64,"column":1},"end":{"row":64,"column":27},"action":"remove","lines":["Affectation des dev aux US"],"id":1467}],[{"start":{"row":64,"column":1},"end":{"row":64,"column":2},"action":"insert","lines":["R"],"id":1468}],[{"start":{"row":64,"column":2},"end":{"row":64,"column":3},"action":"insert","lines":["e"],"id":1469}],[{"start":{"row":64,"column":3},"end":{"row":64,"column":4},"action":"insert","lines":["v"],"id":1470}],[{"start":{"row":64,"column":4},"end":{"row":64,"column":5},"action":"insert","lines":["o"],"id":1471}],[{"start":{"row":64,"column":5},"end":{"row":64,"column":6},"action":"insert","lines":["i"],"id":1472}],[{"start":{"row":64,"column":6},"end":{"row":64,"column":7},"action":"insert","lines":["r"],"id":1473}],[{"start":{"row":64,"column":7},"end":{"row":64,"column":8},"action":"insert","lines":[" "],"id":1474}],[{"start":{"row":64,"column":8},"end":{"row":64,"column":9},"action":"insert","lines":["l"],"id":1475}],[{"start":{"row":64,"column":9},"end":{"row":64,"column":10},"action":"insert","lines":["a"],"id":1476}],[{"start":{"row":64,"column":10},"end":{"row":64,"column":11},"action":"insert","lines":[" "],"id":1477}],[{"start":{"row":64,"column":10},"end":{"row":64,"column":11},"action":"remove","lines":[" "],"id":1478}],[{"start":{"row":64,"column":9},"end":{"row":64,"column":10},"action":"remove","lines":["a"],"id":1479}],[{"start":{"row":64,"column":9},"end":{"row":64,"column":10},"action":"insert","lines":["e"],"id":1480}],[{"start":{"row":64,"column":10},"end":{"row":64,"column":11},"action":"insert","lines":["s"],"id":1481}],[{"start":{"row":64,"column":11},"end":{"row":64,"column":12},"action":"insert","lines":[" "],"id":1482}],[{"start":{"row":64,"column":12},"end":{"row":64,"column":13},"action":"insert","lines":["U"],"id":1483}],[{"start":{"row":64,"column":13},"end":{"row":64,"column":14},"action":"insert","lines":["S"],"id":1484}],[{"start":{"row":64,"column":14},"end":{"row":64,"column":15},"action":"insert","lines":[" "],"id":1485}],[{"start":{"row":64,"column":15},"end":{"row":64,"column":16},"action":"insert","lines":["p"],"id":1486}],[{"start":{"row":64,"column":16},"end":{"row":64,"column":17},"action":"insert","lines":["o"],"id":1487}],[{"start":{"row":64,"column":17},"end":{"row":64,"column":18},"action":"insert","lines":["u"],"id":1488}],[{"start":{"row":64,"column":18},"end":{"row":64,"column":19},"action":"insert","lines":["r"],"id":1489}],[{"start":{"row":64,"column":19},"end":{"row":64,"column":20},"action":"insert","lines":[" "],"id":1490}],[{"start":{"row":64,"column":20},"end":{"row":64,"column":21},"action":"insert","lines":["q"],"id":1491}],[{"start":{"row":64,"column":21},"end":{"row":64,"column":22},"action":"insert","lines":["u"],"id":1492}],[{"start":{"row":64,"column":22},"end":{"row":64,"column":23},"action":"insert","lines":["'"],"id":1493}],[{"start":{"row":64,"column":23},"end":{"row":64,"column":24},"action":"insert","lines":["e"],"id":1494}],[{"start":{"row":64,"column":24},"end":{"row":64,"column":25},"action":"insert","lines":["l"],"id":1495}],[{"start":{"row":64,"column":25},"end":{"row":64,"column":26},"action":"insert","lines":["l"],"id":1496}],[{"start":{"row":64,"column":26},"end":{"row":64,"column":27},"action":"insert","lines":["e"],"id":1497}],[{"start":{"row":64,"column":27},"end":{"row":64,"column":28},"action":"insert","lines":["s"],"id":1498}],[{"start":{"row":64,"column":28},"end":{"row":64,"column":29},"action":"insert","lines":[" "],"id":1499}],[{"start":{"row":64,"column":29},"end":{"row":64,"column":30},"action":"insert","lines":["s"],"id":1500}],[{"start":{"row":64,"column":30},"end":{"row":64,"column":31},"action":"insert","lines":["o"],"id":1501}],[{"start":{"row":64,"column":31},"end":{"row":64,"column":32},"action":"insert","lines":["i"],"id":1502}],[{"start":{"row":64,"column":32},"end":{"row":64,"column":33},"action":"insert","lines":["e"],"id":1503}],[{"start":{"row":64,"column":33},"end":{"row":64,"column":34},"action":"insert","lines":["n"],"id":1504}],[{"start":{"row":64,"column":34},"end":{"row":64,"column":35},"action":"insert","lines":["t"],"id":1505}],[{"start":{"row":64,"column":35},"end":{"row":64,"column":36},"action":"insert","lines":[" "],"id":1506}],[{"start":{"row":64,"column":36},"end":{"row":64,"column":37},"action":"insert","lines":["p"],"id":1507}],[{"start":{"row":64,"column":37},"end":{"row":64,"column":38},"action":"insert","lines":["l"],"id":1508}],[{"start":{"row":64,"column":38},"end":{"row":64,"column":39},"action":"insert","lines":["u"],"id":1509}],[{"start":{"row":64,"column":39},"end":{"row":64,"column":40},"action":"insert","lines":["s"],"id":1510}],[{"start":{"row":64,"column":40},"end":{"row":64,"column":41},"action":"insert","lines":[" "],"id":1511}],[{"start":{"row":64,"column":41},"end":{"row":64,"column":42},"action":"insert","lines":["c"],"id":1512}],[{"start":{"row":64,"column":42},"end":{"row":64,"column":43},"action":"insert","lines":["o"],"id":1513}],[{"start":{"row":64,"column":43},"end":{"row":64,"column":44},"action":"insert","lines":["m"],"id":1514}],[{"start":{"row":64,"column":44},"end":{"row":64,"column":45},"action":"insert","lines":["p"],"id":1515}],[{"start":{"row":64,"column":45},"end":{"row":64,"column":46},"action":"insert","lines":["r"],"id":1516}],[{"start":{"row":64,"column":46},"end":{"row":64,"column":47},"action":"insert","lines":["é"],"id":1517}],[{"start":{"row":64,"column":47},"end":{"row":64,"column":48},"action":"insert","lines":["h"],"id":1518}],[{"start":{"row":64,"column":48},"end":{"row":64,"column":49},"action":"insert","lines":["e"],"id":1519}],[{"start":{"row":64,"column":49},"end":{"row":64,"column":50},"action":"insert","lines":["n"],"id":1520}],[{"start":{"row":64,"column":50},"end":{"row":64,"column":51},"action":"insert","lines":["s"],"id":1521}],[{"start":{"row":64,"column":51},"end":{"row":64,"column":52},"action":"insert","lines":["i"],"id":1522}],[{"start":{"row":64,"column":52},"end":{"row":64,"column":53},"action":"insert","lines":["b"],"id":1523}],[{"start":{"row":64,"column":53},"end":{"row":64,"column":54},"action":"insert","lines":["l"],"id":1524}],[{"start":{"row":64,"column":54},"end":{"row":64,"column":55},"action":"insert","lines":["e"],"id":1525}],[{"start":{"row":64,"column":55},"end":{"row":64,"column":56},"action":"insert","lines":[" "],"id":1526}],[{"start":{"row":64,"column":56},"end":{"row":64,"column":57},"action":"insert","lines":["p"],"id":1527}],[{"start":{"row":64,"column":57},"end":{"row":64,"column":58},"action":"insert","lines":["a"],"id":1528}],[{"start":{"row":64,"column":58},"end":{"row":64,"column":59},"action":"insert","lines":["r"],"id":1529}],[{"start":{"row":64,"column":59},"end":{"row":64,"column":60},"action":"insert","lines":[" "],"id":1530}],[{"start":{"row":64,"column":60},"end":{"row":64,"column":61},"action":"insert","lines":["S"],"id":1531}],[{"start":{"row":64,"column":61},"end":{"row":64,"column":62},"action":"insert","lines":["o"],"id":1532}],[{"start":{"row":64,"column":62},"end":{"row":64,"column":63},"action":"insert","lines":["k"],"id":1533}],[{"start":{"row":64,"column":63},"end":{"row":64,"column":64},"action":"insert","lines":["."],"id":1534}],[{"start":{"row":64,"column":56},"end":{"row":64,"column":57},"action":"insert","lines":["("],"id":1535}],[{"start":{"row":64,"column":57},"end":{"row":64,"column":58},"action":"insert","lines":[")"],"id":1536}],[{"start":{"row":64,"column":58},"end":{"row":64,"column":59},"action":"insert","lines":[" "],"id":1537}],[{"start":{"row":64,"column":57},"end":{"row":64,"column":58},"action":"insert","lines":["p"],"id":1538}],[{"start":{"row":64,"column":58},"end":{"row":64,"column":59},"action":"insert","lines":["l"],"id":1539}],[{"start":{"row":64,"column":59},"end":{"row":64,"column":60},"action":"insert","lines":["u"],"id":1540}],[{"start":{"row":64,"column":60},"end":{"row":64,"column":61},"action":"insert","lines":["s"],"id":1541}],[{"start":{"row":64,"column":61},"end":{"row":64,"column":62},"action":"insert","lines":[" "],"id":1542}],[{"start":{"row":64,"column":62},"end":{"row":64,"column":63},"action":"insert","lines":["s"],"id":1543}],[{"start":{"row":64,"column":63},"end":{"row":64,"column":64},"action":"insert","lines":["i"],"id":1544}],[{"start":{"row":64,"column":64},"end":{"row":64,"column":65},"action":"insert","lines":["m"],"id":1545}],[{"start":{"row":64,"column":65},"end":{"row":64,"column":66},"action":"insert","lines":["p"],"id":1546}],[{"start":{"row":64,"column":66},"end":{"row":64,"column":67},"action":"insert","lines":["l"],"id":1547}],[{"start":{"row":64,"column":67},"end":{"row":64,"column":68},"action":"insert","lines":["e"],"id":1548}],[{"start":{"row":64,"column":78},"end":{"row":65,"column":0},"action":"insert","lines":["",""],"id":1549},{"start":{"row":65,"column":0},"end":{"row":65,"column":1},"action":"insert","lines":["\t"]}],[{"start":{"row":65,"column":1},"end":{"row":65,"column":2},"action":"insert","lines":["P"],"id":1550}],[{"start":{"row":65,"column":2},"end":{"row":65,"column":3},"action":"insert","lines":["l"],"id":1551}],[{"start":{"row":65,"column":3},"end":{"row":65,"column":4},"action":"insert","lines":["u"],"id":1552}],[{"start":{"row":65,"column":4},"end":{"row":65,"column":5},"action":"insert","lines":["s"],"id":1553}],[{"start":{"row":65,"column":5},"end":{"row":65,"column":6},"action":"insert","lines":[" "],"id":1554}],[{"start":{"row":65,"column":6},"end":{"row":65,"column":7},"action":"insert","lines":["d"],"id":1555}],[{"start":{"row":65,"column":7},"end":{"row":65,"column":8},"action":"insert","lines":["e"],"id":1556}],[{"start":{"row":65,"column":8},"end":{"row":65,"column":9},"action":"insert","lines":[" "],"id":1557}],[{"start":{"row":65,"column":9},"end":{"row":65,"column":10},"action":"insert","lines":["c"],"id":1558}],[{"start":{"row":65,"column":10},"end":{"row":65,"column":11},"action":"insert","lines":["o"],"id":1559}],[{"start":{"row":65,"column":11},"end":{"row":65,"column":12},"action":"insert","lines":["m"],"id":1560}],[{"start":{"row":65,"column":12},"end":{"row":65,"column":13},"action":"insert","lines":["m"],"id":1561}],[{"start":{"row":65,"column":9},"end":{"row":65,"column":13},"action":"remove","lines":["comm"],"id":1562},{"start":{"row":65,"column":9},"end":{"row":65,"column":22},"action":"insert","lines":["communication"]}]]},"ace":{"folds":[],"scrolltop":0,"scrollleft":0,"selection":{"start":{"row":14,"column":10},"end":{"row":14,"column":10},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":1,"state":"allowBlock","mode":"ace/mode/markdown"}},"timestamp":1511356554604}
\ No newline at end of file
+{"filter":false,"title":"Retro.2.md","tooltip":"/Retro.2.md","undoManager":{"mark":-1,"position":-1,"stack":[]},"ace":{"folds":[],"scrolltop":6.999999999999994,"scrollleft":0,"selection":{"start":{"row":14,"column":10},"end":{"row":14,"column":10},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0},"timestamp":1511356554604,"hash":"9125f62036c4325e5fe9cd7311de55a6e12be314"}
\ No newline at end of file
diff --git a/workspace/.c9/metadata/workspace/app/Http/Controllers/ProductsController.php b/workspace/.c9/metadata/workspace/app/Http/Controllers/ProductsController.php
index e457fb261b57f0e6e9ce905f3049d0b922ecd06c..523d0fb3b33dc910e26ebfcb2375fa96ba3f87f7 100644
--- a/workspace/.c9/metadata/workspace/app/Http/Controllers/ProductsController.php
+++ b/workspace/.c9/metadata/workspace/app/Http/Controllers/ProductsController.php
@@ -1 +1 @@
-{"filter":false,"title":"ProductsController.php","tooltip":"/app/Http/Controllers/ProductsController.php","undoManager":{"mark":47,"position":47,"stack":[[{"start":{"row":203,"column":97},"end":{"row":203,"column":98},"action":"insert","lines":[","],"id":90,"ignore":true}],[{"start":{"row":203,"column":98},"end":{"row":203,"column":111},"action":"insert","lines":["$address_city"],"id":91,"ignore":true}],[{"start":{"row":201,"column":54},"end":{"row":201,"column":56},"action":"insert","lines":[",$"],"id":92,"ignore":true}],[{"start":{"row":201,"column":56},"end":{"row":201,"column":58},"action":"insert","lines":["ad"],"id":93,"ignore":true}],[{"start":{"row":201,"column":58},"end":{"row":201,"column":59},"action":"insert","lines":["d"],"id":94,"ignore":true}],[{"start":{"row":201,"column":55},"end":{"row":201,"column":59},"action":"remove","lines":["$add"],"id":95,"ignore":true},{"start":{"row":201,"column":55},"end":{"row":201,"column":68},"action":"insert","lines":["$address_city"]}],[{"start":{"row":202,"column":5},"end":{"row":203,"column":9},"action":"insert","lines":[""," i"],"id":96,"ignore":true}],[{"start":{"row":203,"column":9},"end":{"row":203,"column":15},"action":"insert","lines":["f (!$)"],"id":97,"ignore":true}],[{"start":{"row":203,"column":14},"end":{"row":203,"column":16},"action":"insert","lines":["ad"],"id":98,"ignore":true}],[{"start":{"row":203,"column":13},"end":{"row":203,"column":16},"action":"remove","lines":["$ad"],"id":99,"ignore":true},{"start":{"row":203,"column":13},"end":{"row":203,"column":26},"action":"insert","lines":["$address_city"]}],[{"start":{"row":203,"column":27},"end":{"row":205,"column":9},"action":"insert","lines":["{"," "," }"],"id":100,"ignore":true}],[{"start":{"row":204,"column":12},"end":{"row":204,"column":117},"action":"insert","lines":["$products = $this->productRepository->getSearchA($this->nbrPerPage, $category, $expire_at,$address_city);"],"id":101,"ignore":true}],[{"start":{"row":204,"column":101},"end":{"row":204,"column":115},"action":"remove","lines":[",$address_city"],"id":102,"ignore":true}],[{"start":{"row":205,"column":9},"end":{"row":206,"column":9},"action":"insert","lines":[""," e"],"id":103,"ignore":true}],[{"start":{"row":206,"column":9},"end":{"row":206,"column":11},"action":"insert","lines":["ls"],"id":104,"ignore":true}],[{"start":{"row":206,"column":11},"end":{"row":206,"column":13},"action":"insert","lines":["e{"],"id":105,"ignore":true}],[{"start":{"row":207,"column":113},"end":{"row":207,"column":114},"action":"insert","lines":["}"],"id":106,"ignore":true}],[{"start":{"row":204,"column":59},"end":{"row":204,"column":60},"action":"remove","lines":["A"],"id":107,"ignore":true},{"start":{"row":204,"column":59},"end":{"row":204,"column":60},"action":"insert","lines":["B"]}],[{"start":{"row":203,"column":12},"end":{"row":203,"column":13},"action":"remove","lines":["!"],"id":108,"ignore":true},{"start":{"row":207,"column":113},"end":{"row":209,"column":8},"action":"insert","lines":[""," "," "]}],[{"start":{"row":203,"column":25},"end":{"row":203,"column":32},"action":"insert","lines":[" == \" \""],"id":109,"ignore":true}],[{"start":{"row":207,"column":113},"end":{"row":208,"column":12},"action":"remove","lines":[""," "],"id":110,"ignore":true}],[{"start":{"row":203,"column":32},"end":{"row":203,"column":37},"action":"insert","lines":[" && $"],"id":111,"ignore":true}],[{"start":{"row":203,"column":37},"end":{"row":203,"column":39},"action":"insert","lines":["ex"],"id":112,"ignore":true}],[{"start":{"row":203,"column":36},"end":{"row":203,"column":39},"action":"remove","lines":["$ex"],"id":113,"ignore":true},{"start":{"row":203,"column":36},"end":{"row":203,"column":49},"action":"insert","lines":["$expire_at =="]}],[{"start":{"row":203,"column":49},"end":{"row":203,"column":53},"action":"insert","lines":[" \" \""],"id":114,"ignore":true}],[{"start":{"row":203,"column":55},"end":{"row":204,"column":12},"action":"insert","lines":[""," "],"id":115,"ignore":true}],[{"start":{"row":203,"column":32},"end":{"row":203,"column":53},"action":"remove","lines":[" && $expire_at == \" \""],"id":117},{"start":{"row":203,"column":34},"end":{"row":205,"column":9},"action":"remove","lines":[""," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"]}],[{"start":{"row":203,"column":34},"end":{"row":204,"column":8},"action":"insert","lines":[""," "],"id":118,"ignore":true}],[{"start":{"row":203,"column":34},"end":{"row":204,"column":8},"action":"remove","lines":[""," "],"id":119,"ignore":true}],[{"start":{"row":203,"column":32},"end":{"row":203,"column":53},"action":"insert","lines":[" && $expire_at == \" \""],"id":120,"ignore":true},{"start":{"row":203,"column":55},"end":{"row":205,"column":9},"action":"insert","lines":[""," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"]}],[{"start":{"row":205,"column":9},"end":{"row":208,"column":9},"action":"insert","lines":[""," if ($address_city == \" \" && $expire_at == \" \"){"," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"],"id":121,"ignore":true}],[{"start":{"row":206,"column":47},"end":{"row":206,"column":48},"action":"remove","lines":["="],"id":122,"ignore":true},{"start":{"row":206,"column":47},"end":{"row":206,"column":48},"action":"insert","lines":["!"]}],[{"start":{"row":208,"column":9},"end":{"row":211,"column":9},"action":"insert","lines":[""," if ($address_city == \" \" && $expire_at != \" \"){"," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"],"id":123,"ignore":true}],[{"start":{"row":209,"column":26},"end":{"row":209,"column":27},"action":"remove","lines":["="],"id":124,"ignore":true},{"start":{"row":209,"column":26},"end":{"row":209,"column":27},"action":"insert","lines":["!"]},{"start":{"row":209,"column":47},"end":{"row":209,"column":48},"action":"remove","lines":["!"]},{"start":{"row":209,"column":47},"end":{"row":209,"column":48},"action":"insert","lines":["="]}],[{"start":{"row":204,"column":59},"end":{"row":204,"column":60},"action":"remove","lines":["B"],"id":125,"ignore":true},{"start":{"row":211,"column":9},"end":{"row":212,"column":8},"action":"insert","lines":[""," "]}],[{"start":{"row":212,"column":8},"end":{"row":214,"column":9},"action":"insert","lines":["if ($address_city == \" \" && $expire_at != \" \"){"," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"],"id":126,"ignore":true}],[{"start":{"row":212,"column":26},"end":{"row":212,"column":27},"action":"remove","lines":["="],"id":127,"ignore":true},{"start":{"row":212,"column":26},"end":{"row":212,"column":27},"action":"insert","lines":["!"]}],[{"start":{"row":213,"column":12},"end":{"row":213,"column":103},"action":"remove","lines":["$products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"],"id":128,"ignore":true},{"start":{"row":213,"column":12},"end":{"row":213,"column":117},"action":"insert","lines":["$products = $this->productRepository->getSearchA($this->nbrPerPage, $category, $expire_at,$address_city);"]},{"start":{"row":215,"column":4},"end":{"row":219,"column":9},"action":"remove","lines":[" $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"," else{"," $products = $this->productRepository->getSearchA($this->nbrPerPage, $category, $expire_at,$address_city);"," }"]}],[{"start":{"row":210,"column":99},"end":{"row":210,"column":101},"action":"remove","lines":["at"],"id":129,"ignore":true},{"start":{"row":214,"column":9},"end":{"row":215,"column":4},"action":"remove","lines":[""," "]}],[{"start":{"row":210,"column":92},"end":{"row":210,"column":99},"action":"remove","lines":["expire_"],"id":130,"ignore":true},{"start":{"row":210,"column":92},"end":{"row":210,"column":94},"action":"insert","lines":["ad"]}],[{"start":{"row":210,"column":94},"end":{"row":210,"column":95},"action":"insert","lines":["d"],"id":131,"ignore":true}],[{"start":{"row":210,"column":95},"end":{"row":210,"column":96},"action":"insert","lines":["r"],"id":132,"ignore":true}],[{"start":{"row":207,"column":59},"end":{"row":207,"column":60},"action":"remove","lines":["B"],"id":133,"ignore":true},{"start":{"row":207,"column":59},"end":{"row":207,"column":60},"action":"insert","lines":["N"]},{"start":{"row":210,"column":91},"end":{"row":210,"column":96},"action":"remove","lines":["$addr"]},{"start":{"row":210,"column":91},"end":{"row":210,"column":104},"action":"insert","lines":["$address_city"]}],[{"start":{"row":207,"column":60},"end":{"row":207,"column":61},"action":"insert","lines":["o"],"id":134,"ignore":true}],[{"start":{"row":207,"column":61},"end":{"row":207,"column":65},"action":"insert","lines":["city"],"id":135,"ignore":true},{"start":{"row":210,"column":59},"end":{"row":210,"column":60},"action":"remove","lines":["B"]},{"start":{"row":210,"column":59},"end":{"row":210,"column":60},"action":"insert","lines":["N"]}],[{"start":{"row":210,"column":60},"end":{"row":210,"column":61},"action":"insert","lines":["o"],"id":136,"ignore":true}],[{"start":{"row":210,"column":61},"end":{"row":210,"column":65},"action":"insert","lines":["date"],"id":137,"ignore":true}],[{"start":{"row":204,"column":88},"end":{"row":204,"column":100},"action":"remove","lines":[", $expire_at"],"id":138,"ignore":true}]]},"ace":{"folds":[],"scrolltop":360,"scrollleft":0,"selection":{"start":{"row":46,"column":14},"end":{"row":46,"column":38},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":true,"wrapToView":true},"firstLineState":{"row":24,"state":"php-start","mode":"ace/mode/php"}},"timestamp":1513548540099,"hash":"2c30d238ce998efa89c5a97fa0fe01de36fbba90"}
\ No newline at end of file
+{"filter":false,"title":"ProductsController.php","tooltip":"/app/Http/Controllers/ProductsController.php","undoManager":{"mark":47,"position":47,"stack":[[{"start":{"row":203,"column":97},"end":{"row":203,"column":98},"action":"insert","lines":[","],"id":90,"ignore":true}],[{"start":{"row":203,"column":98},"end":{"row":203,"column":111},"action":"insert","lines":["$address_city"],"id":91,"ignore":true}],[{"start":{"row":201,"column":54},"end":{"row":201,"column":56},"action":"insert","lines":[",$"],"id":92,"ignore":true}],[{"start":{"row":201,"column":56},"end":{"row":201,"column":58},"action":"insert","lines":["ad"],"id":93,"ignore":true}],[{"start":{"row":201,"column":58},"end":{"row":201,"column":59},"action":"insert","lines":["d"],"id":94,"ignore":true}],[{"start":{"row":201,"column":55},"end":{"row":201,"column":59},"action":"remove","lines":["$add"],"id":95,"ignore":true},{"start":{"row":201,"column":55},"end":{"row":201,"column":68},"action":"insert","lines":["$address_city"]}],[{"start":{"row":202,"column":5},"end":{"row":203,"column":9},"action":"insert","lines":[""," i"],"id":96,"ignore":true}],[{"start":{"row":203,"column":9},"end":{"row":203,"column":15},"action":"insert","lines":["f (!$)"],"id":97,"ignore":true}],[{"start":{"row":203,"column":14},"end":{"row":203,"column":16},"action":"insert","lines":["ad"],"id":98,"ignore":true}],[{"start":{"row":203,"column":13},"end":{"row":203,"column":16},"action":"remove","lines":["$ad"],"id":99,"ignore":true},{"start":{"row":203,"column":13},"end":{"row":203,"column":26},"action":"insert","lines":["$address_city"]}],[{"start":{"row":203,"column":27},"end":{"row":205,"column":9},"action":"insert","lines":["{"," "," }"],"id":100,"ignore":true}],[{"start":{"row":204,"column":12},"end":{"row":204,"column":117},"action":"insert","lines":["$products = $this->productRepository->getSearchA($this->nbrPerPage, $category, $expire_at,$address_city);"],"id":101,"ignore":true}],[{"start":{"row":204,"column":101},"end":{"row":204,"column":115},"action":"remove","lines":[",$address_city"],"id":102,"ignore":true}],[{"start":{"row":205,"column":9},"end":{"row":206,"column":9},"action":"insert","lines":[""," e"],"id":103,"ignore":true}],[{"start":{"row":206,"column":9},"end":{"row":206,"column":11},"action":"insert","lines":["ls"],"id":104,"ignore":true}],[{"start":{"row":206,"column":11},"end":{"row":206,"column":13},"action":"insert","lines":["e{"],"id":105,"ignore":true}],[{"start":{"row":207,"column":113},"end":{"row":207,"column":114},"action":"insert","lines":["}"],"id":106,"ignore":true}],[{"start":{"row":204,"column":59},"end":{"row":204,"column":60},"action":"remove","lines":["A"],"id":107,"ignore":true},{"start":{"row":204,"column":59},"end":{"row":204,"column":60},"action":"insert","lines":["B"]}],[{"start":{"row":203,"column":12},"end":{"row":203,"column":13},"action":"remove","lines":["!"],"id":108,"ignore":true},{"start":{"row":207,"column":113},"end":{"row":209,"column":8},"action":"insert","lines":[""," "," "]}],[{"start":{"row":203,"column":25},"end":{"row":203,"column":32},"action":"insert","lines":[" == \" \""],"id":109,"ignore":true}],[{"start":{"row":207,"column":113},"end":{"row":208,"column":12},"action":"remove","lines":[""," "],"id":110,"ignore":true}],[{"start":{"row":203,"column":32},"end":{"row":203,"column":37},"action":"insert","lines":[" && $"],"id":111,"ignore":true}],[{"start":{"row":203,"column":37},"end":{"row":203,"column":39},"action":"insert","lines":["ex"],"id":112,"ignore":true}],[{"start":{"row":203,"column":36},"end":{"row":203,"column":39},"action":"remove","lines":["$ex"],"id":113,"ignore":true},{"start":{"row":203,"column":36},"end":{"row":203,"column":49},"action":"insert","lines":["$expire_at =="]}],[{"start":{"row":203,"column":49},"end":{"row":203,"column":53},"action":"insert","lines":[" \" \""],"id":114,"ignore":true}],[{"start":{"row":203,"column":55},"end":{"row":204,"column":12},"action":"insert","lines":[""," "],"id":115,"ignore":true}],[{"start":{"row":203,"column":32},"end":{"row":203,"column":53},"action":"remove","lines":[" && $expire_at == \" \""],"id":117},{"start":{"row":203,"column":34},"end":{"row":205,"column":9},"action":"remove","lines":[""," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"]}],[{"start":{"row":203,"column":34},"end":{"row":204,"column":8},"action":"insert","lines":[""," "],"id":118,"ignore":true}],[{"start":{"row":203,"column":34},"end":{"row":204,"column":8},"action":"remove","lines":[""," "],"id":119,"ignore":true}],[{"start":{"row":203,"column":32},"end":{"row":203,"column":53},"action":"insert","lines":[" && $expire_at == \" \""],"id":120,"ignore":true},{"start":{"row":203,"column":55},"end":{"row":205,"column":9},"action":"insert","lines":[""," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"]}],[{"start":{"row":205,"column":9},"end":{"row":208,"column":9},"action":"insert","lines":[""," if ($address_city == \" \" && $expire_at == \" \"){"," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"],"id":121,"ignore":true}],[{"start":{"row":206,"column":47},"end":{"row":206,"column":48},"action":"remove","lines":["="],"id":122,"ignore":true},{"start":{"row":206,"column":47},"end":{"row":206,"column":48},"action":"insert","lines":["!"]}],[{"start":{"row":208,"column":9},"end":{"row":211,"column":9},"action":"insert","lines":[""," if ($address_city == \" \" && $expire_at != \" \"){"," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"],"id":123,"ignore":true}],[{"start":{"row":209,"column":26},"end":{"row":209,"column":27},"action":"remove","lines":["="],"id":124,"ignore":true},{"start":{"row":209,"column":26},"end":{"row":209,"column":27},"action":"insert","lines":["!"]},{"start":{"row":209,"column":47},"end":{"row":209,"column":48},"action":"remove","lines":["!"]},{"start":{"row":209,"column":47},"end":{"row":209,"column":48},"action":"insert","lines":["="]}],[{"start":{"row":204,"column":59},"end":{"row":204,"column":60},"action":"remove","lines":["B"],"id":125,"ignore":true},{"start":{"row":211,"column":9},"end":{"row":212,"column":8},"action":"insert","lines":[""," "]}],[{"start":{"row":212,"column":8},"end":{"row":214,"column":9},"action":"insert","lines":["if ($address_city == \" \" && $expire_at != \" \"){"," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"],"id":126,"ignore":true}],[{"start":{"row":212,"column":26},"end":{"row":212,"column":27},"action":"remove","lines":["="],"id":127,"ignore":true},{"start":{"row":212,"column":26},"end":{"row":212,"column":27},"action":"insert","lines":["!"]}],[{"start":{"row":213,"column":12},"end":{"row":213,"column":103},"action":"remove","lines":["$products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"],"id":128,"ignore":true},{"start":{"row":213,"column":12},"end":{"row":213,"column":117},"action":"insert","lines":["$products = $this->productRepository->getSearchA($this->nbrPerPage, $category, $expire_at,$address_city);"]},{"start":{"row":215,"column":4},"end":{"row":219,"column":9},"action":"remove","lines":[" $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"," else{"," $products = $this->productRepository->getSearchA($this->nbrPerPage, $category, $expire_at,$address_city);"," }"]}],[{"start":{"row":210,"column":99},"end":{"row":210,"column":101},"action":"remove","lines":["at"],"id":129,"ignore":true},{"start":{"row":214,"column":9},"end":{"row":215,"column":4},"action":"remove","lines":[""," "]}],[{"start":{"row":210,"column":92},"end":{"row":210,"column":99},"action":"remove","lines":["expire_"],"id":130,"ignore":true},{"start":{"row":210,"column":92},"end":{"row":210,"column":94},"action":"insert","lines":["ad"]}],[{"start":{"row":210,"column":94},"end":{"row":210,"column":95},"action":"insert","lines":["d"],"id":131,"ignore":true}],[{"start":{"row":210,"column":95},"end":{"row":210,"column":96},"action":"insert","lines":["r"],"id":132,"ignore":true}],[{"start":{"row":207,"column":59},"end":{"row":207,"column":60},"action":"remove","lines":["B"],"id":133,"ignore":true},{"start":{"row":207,"column":59},"end":{"row":207,"column":60},"action":"insert","lines":["N"]},{"start":{"row":210,"column":91},"end":{"row":210,"column":96},"action":"remove","lines":["$addr"]},{"start":{"row":210,"column":91},"end":{"row":210,"column":104},"action":"insert","lines":["$address_city"]}],[{"start":{"row":207,"column":60},"end":{"row":207,"column":61},"action":"insert","lines":["o"],"id":134,"ignore":true}],[{"start":{"row":207,"column":61},"end":{"row":207,"column":65},"action":"insert","lines":["city"],"id":135,"ignore":true},{"start":{"row":210,"column":59},"end":{"row":210,"column":60},"action":"remove","lines":["B"]},{"start":{"row":210,"column":59},"end":{"row":210,"column":60},"action":"insert","lines":["N"]}],[{"start":{"row":210,"column":60},"end":{"row":210,"column":61},"action":"insert","lines":["o"],"id":136,"ignore":true}],[{"start":{"row":210,"column":61},"end":{"row":210,"column":65},"action":"insert","lines":["date"],"id":137,"ignore":true}],[{"start":{"row":204,"column":88},"end":{"row":204,"column":100},"action":"remove","lines":[", $expire_at"],"id":138,"ignore":true}]]},"ace":{"folds":[],"scrolltop":360,"scrollleft":0,"selection":{"start":{"row":46,"column":14},"end":{"row":46,"column":38},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":true,"wrapToView":true},"firstLineState":0},"timestamp":1513548540099,"hash":"2c30d238ce998efa89c5a97fa0fe01de36fbba90"}
\ No newline at end of file
diff --git a/workspace/.c9/metadata/workspace/app/Http/Controllers/UserController.php b/workspace/.c9/metadata/workspace/app/Http/Controllers/UserController.php
index bd43183d49f8eef94d5cdd7d00b0b784c713e69d..c8d00c89706a855e0670e0c48069539e7b13693c 100644
--- a/workspace/.c9/metadata/workspace/app/Http/Controllers/UserController.php
+++ b/workspace/.c9/metadata/workspace/app/Http/Controllers/UserController.php
@@ -1 +1 @@
-{"filter":false,"title":"UserController.php","tooltip":"/app/Http/Controllers/UserController.php","undoManager":{"mark":100,"position":100,"stack":[[{"start":{"row":58,"column":35},"end":{"row":58,"column":36},"action":"insert","lines":["e"],"id":1366}],[{"start":{"row":58,"column":36},"end":{"row":58,"column":37},"action":"insert","lines":["r"],"id":1367}],[{"start":{"row":58,"column":37},"end":{"row":58,"column":38},"action":"insert","lines":["v"],"id":1368}],[{"start":{"row":58,"column":38},"end":{"row":58,"column":39},"action":"insert","lines":["a"],"id":1369}],[{"start":{"row":58,"column":39},"end":{"row":58,"column":40},"action":"insert","lines":["t"],"id":1370}],[{"start":{"row":58,"column":40},"end":{"row":58,"column":41},"action":"insert","lines":["i"],"id":1371}],[{"start":{"row":58,"column":41},"end":{"row":58,"column":42},"action":"insert","lines":["o"],"id":1372}],[{"start":{"row":58,"column":42},"end":{"row":58,"column":43},"action":"insert","lines":["n"],"id":1373}],[{"start":{"row":58,"column":43},"end":{"row":58,"column":44},"action":"insert","lines":["s"],"id":1374}],[{"start":{"row":58,"column":44},"end":{"row":58,"column":45},"action":"insert","lines":["."],"id":1375}],[{"start":{"row":69,"column":38},"end":{"row":69,"column":42},"action":"remove","lines":["', '"],"id":1376},{"start":{"row":69,"column":38},"end":{"row":69,"column":39},"action":"insert","lines":[" "]}],[{"start":{"row":61,"column":43},"end":{"row":61,"column":47},"action":"remove","lines":["', '"],"id":1377},{"start":{"row":61,"column":43},"end":{"row":61,"column":44},"action":"insert","lines":[" "]}],[{"start":{"row":60,"column":195},"end":{"row":60,"column":196},"action":"insert","lines":[","],"id":1378}],[{"start":{"row":60,"column":196},"end":{"row":60,"column":197},"action":"insert","lines":[" "],"id":1379}],[{"start":{"row":60,"column":197},"end":{"row":60,"column":198},"action":"insert","lines":["r"],"id":1380}],[{"start":{"row":60,"column":198},"end":{"row":60,"column":199},"action":"insert","lines":["e"],"id":1381}],[{"start":{"row":60,"column":199},"end":{"row":60,"column":200},"action":"insert","lines":["s"],"id":1382}],[{"start":{"row":60,"column":200},"end":{"row":60,"column":201},"action":"insert","lines":["e"],"id":1383}],[{"start":{"row":60,"column":201},"end":{"row":60,"column":202},"action":"insert","lines":["r"],"id":1384}],[{"start":{"row":60,"column":202},"end":{"row":60,"column":203},"action":"insert","lines":["v"],"id":1385}],[{"start":{"row":60,"column":203},"end":{"row":60,"column":204},"action":"insert","lines":["a"],"id":1386}],[{"start":{"row":60,"column":204},"end":{"row":60,"column":205},"action":"insert","lines":["t"],"id":1387}],[{"start":{"row":60,"column":205},"end":{"row":60,"column":206},"action":"insert","lines":["i"],"id":1388}],[{"start":{"row":60,"column":206},"end":{"row":60,"column":207},"action":"insert","lines":["o"],"id":1389}],[{"start":{"row":60,"column":207},"end":{"row":60,"column":208},"action":"insert","lines":["n"],"id":1390}],[{"start":{"row":60,"column":208},"end":{"row":60,"column":209},"action":"insert","lines":["s"],"id":1391}],[{"start":{"row":60,"column":209},"end":{"row":60,"column":210},"action":"insert","lines":["."],"id":1392}],[{"start":{"row":60,"column":209},"end":{"row":60,"column":210},"action":"remove","lines":["."],"id":1393}],[{"start":{"row":60,"column":208},"end":{"row":60,"column":209},"action":"remove","lines":["s"],"id":1394}],[{"start":{"row":60,"column":207},"end":{"row":60,"column":208},"action":"remove","lines":["n"],"id":1395}],[{"start":{"row":60,"column":206},"end":{"row":60,"column":207},"action":"remove","lines":["o"],"id":1396}],[{"start":{"row":60,"column":205},"end":{"row":60,"column":206},"action":"remove","lines":["i"],"id":1397}],[{"start":{"row":60,"column":204},"end":{"row":60,"column":205},"action":"remove","lines":["t"],"id":1398}],[{"start":{"row":60,"column":203},"end":{"row":60,"column":204},"action":"remove","lines":["a"],"id":1399}],[{"start":{"row":60,"column":202},"end":{"row":60,"column":203},"action":"remove","lines":["v"],"id":1400}],[{"start":{"row":60,"column":201},"end":{"row":60,"column":202},"action":"remove","lines":["r"],"id":1401}],[{"start":{"row":60,"column":200},"end":{"row":60,"column":201},"action":"remove","lines":["e"],"id":1402}],[{"start":{"row":60,"column":199},"end":{"row":60,"column":200},"action":"remove","lines":["s"],"id":1403}],[{"start":{"row":60,"column":198},"end":{"row":60,"column":199},"action":"remove","lines":["e"],"id":1404}],[{"start":{"row":60,"column":197},"end":{"row":60,"column":198},"action":"remove","lines":["r"],"id":1405}],[{"start":{"row":60,"column":196},"end":{"row":60,"column":197},"action":"remove","lines":[" "],"id":1406}],[{"start":{"row":60,"column":195},"end":{"row":60,"column":196},"action":"remove","lines":[","],"id":1434}],[{"start":{"row":61,"column":43},"end":{"row":61,"column":44},"action":"insert","lines":["'"],"id":1435}],[{"start":{"row":61,"column":44},"end":{"row":61,"column":45},"action":"insert","lines":["'"],"id":1436}],[{"start":{"row":61,"column":45},"end":{"row":61,"column":46},"action":"remove","lines":[" "],"id":1437}],[{"start":{"row":61,"column":44},"end":{"row":61,"column":45},"action":"insert","lines":[","],"id":1438}],[{"start":{"row":61,"column":45},"end":{"row":61,"column":46},"action":"insert","lines":[" "],"id":1439}],[{"start":{"row":61,"column":46},"end":{"row":61,"column":50},"action":"remove","lines":["'=',"],"id":1440}],[{"start":{"row":61,"column":45},"end":{"row":61,"column":46},"action":"remove","lines":[" "],"id":1441}],[{"start":{"row":69,"column":38},"end":{"row":69,"column":41},"action":"remove","lines":[" ='"],"id":1442}],[{"start":{"row":69,"column":38},"end":{"row":69,"column":39},"action":"insert","lines":["'"],"id":1443}],[{"start":{"row":68,"column":28},"end":{"row":68,"column":29},"action":"remove","lines":["*"],"id":1444}],[{"start":{"row":68,"column":28},"end":{"row":68,"column":29},"action":"insert","lines":["i"],"id":1445}],[{"start":{"row":68,"column":29},"end":{"row":68,"column":30},"action":"insert","lines":["d"],"id":1446}],[{"start":{"row":68,"column":30},"end":{"row":68,"column":31},"action":"insert","lines":[" "],"id":1447}],[{"start":{"row":68,"column":31},"end":{"row":68,"column":32},"action":"insert","lines":["a"],"id":1448}],[{"start":{"row":68,"column":32},"end":{"row":68,"column":33},"action":"insert","lines":["s"],"id":1449}],[{"start":{"row":68,"column":33},"end":{"row":68,"column":34},"action":"insert","lines":[" "],"id":1450}],[{"start":{"row":68,"column":34},"end":{"row":68,"column":35},"action":"insert","lines":["i"],"id":1451}],[{"start":{"row":68,"column":35},"end":{"row":68,"column":36},"action":"insert","lines":["d"],"id":1452}],[{"start":{"row":68,"column":36},"end":{"row":68,"column":37},"action":"insert","lines":["_"],"id":1453}],[{"start":{"row":68,"column":37},"end":{"row":68,"column":38},"action":"insert","lines":["u"],"id":1454}],[{"start":{"row":68,"column":38},"end":{"row":68,"column":39},"action":"insert","lines":["s"],"id":1455}],[{"start":{"row":68,"column":39},"end":{"row":68,"column":40},"action":"insert","lines":["e"],"id":1456}],[{"start":{"row":68,"column":40},"end":{"row":68,"column":41},"action":"insert","lines":["r"],"id":1457}],[{"start":{"row":68,"column":42},"end":{"row":68,"column":43},"action":"insert","lines":[","],"id":1458}],[{"start":{"row":68,"column":43},"end":{"row":68,"column":44},"action":"insert","lines":[" "],"id":1459}],[{"start":{"row":68,"column":44},"end":{"row":68,"column":46},"action":"insert","lines":["''"],"id":1460}],[{"start":{"row":68,"column":45},"end":{"row":68,"column":46},"action":"insert","lines":["u"],"id":1461}],[{"start":{"row":68,"column":46},"end":{"row":68,"column":47},"action":"insert","lines":["s"],"id":1462}],[{"start":{"row":68,"column":47},"end":{"row":68,"column":48},"action":"insert","lines":["e"],"id":1463}],[{"start":{"row":68,"column":48},"end":{"row":68,"column":49},"action":"insert","lines":["r"],"id":1464}],[{"start":{"row":68,"column":49},"end":{"row":68,"column":50},"action":"insert","lines":["s"],"id":1465}],[{"start":{"row":68,"column":50},"end":{"row":68,"column":51},"action":"insert","lines":["."],"id":1466}],[{"start":{"row":68,"column":51},"end":{"row":68,"column":52},"action":"insert","lines":["n"],"id":1467}],[{"start":{"row":68,"column":52},"end":{"row":68,"column":53},"action":"insert","lines":["a"],"id":1468}],[{"start":{"row":68,"column":53},"end":{"row":68,"column":54},"action":"insert","lines":["m"],"id":1469}],[{"start":{"row":68,"column":54},"end":{"row":68,"column":55},"action":"insert","lines":["e"],"id":1470}],[{"start":{"row":68,"column":56},"end":{"row":68,"column":57},"action":"insert","lines":[","],"id":1471}],[{"start":{"row":68,"column":57},"end":{"row":68,"column":58},"action":"insert","lines":[" "],"id":1472}],[{"start":{"row":68,"column":58},"end":{"row":68,"column":60},"action":"insert","lines":["''"],"id":1473}],[{"start":{"row":68,"column":59},"end":{"row":68,"column":60},"action":"insert","lines":["u"],"id":1474}],[{"start":{"row":68,"column":60},"end":{"row":68,"column":61},"action":"insert","lines":["s"],"id":1475}],[{"start":{"row":68,"column":61},"end":{"row":68,"column":62},"action":"insert","lines":["e"],"id":1476}],[{"start":{"row":68,"column":62},"end":{"row":68,"column":63},"action":"insert","lines":["r"],"id":1477}],[{"start":{"row":68,"column":63},"end":{"row":68,"column":64},"action":"insert","lines":["s"],"id":1478}],[{"start":{"row":68,"column":64},"end":{"row":68,"column":65},"action":"insert","lines":["."],"id":1479}],[{"start":{"row":68,"column":65},"end":{"row":68,"column":66},"action":"insert","lines":["e"],"id":1480}],[{"start":{"row":68,"column":66},"end":{"row":68,"column":67},"action":"insert","lines":["ù"],"id":1481}],[{"start":{"row":68,"column":67},"end":{"row":68,"column":68},"action":"insert","lines":["a"],"id":1482}],[{"start":{"row":68,"column":67},"end":{"row":68,"column":68},"action":"remove","lines":["a"],"id":1483}],[{"start":{"row":68,"column":66},"end":{"row":68,"column":67},"action":"remove","lines":["ù"],"id":1484}],[{"start":{"row":68,"column":66},"end":{"row":68,"column":67},"action":"insert","lines":["m"],"id":1485}],[{"start":{"row":68,"column":67},"end":{"row":68,"column":68},"action":"insert","lines":["a"],"id":1486}],[{"start":{"row":68,"column":68},"end":{"row":68,"column":69},"action":"insert","lines":["i"],"id":1487}],[{"start":{"row":68,"column":69},"end":{"row":68,"column":70},"action":"insert","lines":["l"],"id":1488}],[{"start":{"row":60,"column":21},"end":{"row":60,"column":31},"action":"remove","lines":["'users.*',"],"id":1489},{"start":{"row":60,"column":21},"end":{"row":60,"column":73},"action":"insert","lines":["'users.id as id_user', 'users.name', 'users.email', "]}],[{"start":{"row":60,"column":72},"end":{"row":60,"column":73},"action":"remove","lines":[" "],"id":1490}],[{"start":{"row":60,"column":21},"end":{"row":60,"column":45},"action":"insert","lines":["'reservations.id_sender'"],"id":1491}],[{"start":{"row":60,"column":45},"end":{"row":60,"column":46},"action":"insert","lines":[","],"id":1492}],[{"start":{"row":60,"column":46},"end":{"row":60,"column":47},"action":"insert","lines":[" "],"id":1493}]]},"ace":{"folds":[],"scrolltop":730,"scrollleft":0,"selection":{"start":{"row":87,"column":2},"end":{"row":87,"column":2},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":62,"state":"php-start","mode":"ace/mode/php"}},"timestamp":1513552939808,"hash":"f1c129edf28f2815251c4b290fc0a1ce051f584e"}
\ No newline at end of file
+{"filter":false,"title":"UserController.php","tooltip":"/app/Http/Controllers/UserController.php","undoManager":{"mark":100,"position":100,"stack":[[{"start":{"row":68,"column":56},"end":{"row":68,"column":57},"action":"insert","lines":[","],"id":1471}],[{"start":{"row":68,"column":57},"end":{"row":68,"column":58},"action":"insert","lines":[" "],"id":1472}],[{"start":{"row":68,"column":58},"end":{"row":68,"column":60},"action":"insert","lines":["''"],"id":1473}],[{"start":{"row":68,"column":59},"end":{"row":68,"column":60},"action":"insert","lines":["u"],"id":1474}],[{"start":{"row":68,"column":60},"end":{"row":68,"column":61},"action":"insert","lines":["s"],"id":1475}],[{"start":{"row":68,"column":61},"end":{"row":68,"column":62},"action":"insert","lines":["e"],"id":1476}],[{"start":{"row":68,"column":62},"end":{"row":68,"column":63},"action":"insert","lines":["r"],"id":1477}],[{"start":{"row":68,"column":63},"end":{"row":68,"column":64},"action":"insert","lines":["s"],"id":1478}],[{"start":{"row":68,"column":64},"end":{"row":68,"column":65},"action":"insert","lines":["."],"id":1479}],[{"start":{"row":68,"column":65},"end":{"row":68,"column":66},"action":"insert","lines":["e"],"id":1480}],[{"start":{"row":68,"column":66},"end":{"row":68,"column":67},"action":"insert","lines":["ù"],"id":1481}],[{"start":{"row":68,"column":67},"end":{"row":68,"column":68},"action":"insert","lines":["a"],"id":1482}],[{"start":{"row":68,"column":67},"end":{"row":68,"column":68},"action":"remove","lines":["a"],"id":1483}],[{"start":{"row":68,"column":66},"end":{"row":68,"column":67},"action":"remove","lines":["ù"],"id":1484}],[{"start":{"row":68,"column":66},"end":{"row":68,"column":67},"action":"insert","lines":["m"],"id":1485}],[{"start":{"row":68,"column":67},"end":{"row":68,"column":68},"action":"insert","lines":["a"],"id":1486}],[{"start":{"row":68,"column":68},"end":{"row":68,"column":69},"action":"insert","lines":["i"],"id":1487}],[{"start":{"row":68,"column":69},"end":{"row":68,"column":70},"action":"insert","lines":["l"],"id":1488}],[{"start":{"row":60,"column":21},"end":{"row":60,"column":31},"action":"remove","lines":["'users.*',"],"id":1489},{"start":{"row":60,"column":21},"end":{"row":60,"column":73},"action":"insert","lines":["'users.id as id_user', 'users.name', 'users.email', "]}],[{"start":{"row":60,"column":72},"end":{"row":60,"column":73},"action":"remove","lines":[" "],"id":1490}],[{"start":{"row":60,"column":21},"end":{"row":60,"column":45},"action":"insert","lines":["'reservations.id_sender'"],"id":1491}],[{"start":{"row":60,"column":45},"end":{"row":60,"column":46},"action":"insert","lines":[","],"id":1492}],[{"start":{"row":60,"column":46},"end":{"row":60,"column":47},"action":"insert","lines":[" "],"id":1493}],[{"start":{"row":8,"column":43},"end":{"row":9,"column":0},"action":"insert","lines":["",""],"id":1494}],[{"start":{"row":9,"column":0},"end":{"row":9,"column":43},"action":"insert","lines":["use App\\Repositories\\ReservationRepository;"],"id":1495}],[{"start":{"row":9,"column":31},"end":{"row":9,"column":32},"action":"remove","lines":["n"],"id":1496}],[{"start":{"row":9,"column":30},"end":{"row":9,"column":31},"action":"remove","lines":["o"],"id":1497}],[{"start":{"row":9,"column":29},"end":{"row":9,"column":30},"action":"remove","lines":["i"],"id":1498}],[{"start":{"row":9,"column":28},"end":{"row":9,"column":29},"action":"remove","lines":["t"],"id":1499}],[{"start":{"row":9,"column":27},"end":{"row":9,"column":28},"action":"remove","lines":["a"],"id":1500}],[{"start":{"row":9,"column":26},"end":{"row":9,"column":27},"action":"remove","lines":["v"],"id":1501}],[{"start":{"row":9,"column":25},"end":{"row":9,"column":26},"action":"remove","lines":["r"],"id":1502}],[{"start":{"row":9,"column":24},"end":{"row":9,"column":25},"action":"remove","lines":["e"],"id":1503}],[{"start":{"row":9,"column":23},"end":{"row":9,"column":24},"action":"remove","lines":["s"],"id":1504}],[{"start":{"row":9,"column":22},"end":{"row":9,"column":23},"action":"remove","lines":["e"],"id":1505}],[{"start":{"row":9,"column":21},"end":{"row":9,"column":22},"action":"remove","lines":["R"],"id":1506}],[{"start":{"row":9,"column":21},"end":{"row":9,"column":22},"action":"insert","lines":["P"],"id":1507}],[{"start":{"row":9,"column":22},"end":{"row":9,"column":23},"action":"insert","lines":["r"],"id":1508}],[{"start":{"row":9,"column":23},"end":{"row":9,"column":24},"action":"insert","lines":["o"],"id":1509}],[{"start":{"row":9,"column":24},"end":{"row":9,"column":25},"action":"insert","lines":["d"],"id":1510}],[{"start":{"row":9,"column":25},"end":{"row":9,"column":26},"action":"insert","lines":["u"],"id":1511}],[{"start":{"row":9,"column":26},"end":{"row":9,"column":27},"action":"insert","lines":["c"],"id":1512}],[{"start":{"row":9,"column":27},"end":{"row":9,"column":28},"action":"insert","lines":["t"],"id":1513}],[{"start":{"row":71,"column":14},"end":{"row":71,"column":15},"action":"remove","lines":["p"],"id":1514}],[{"start":{"row":71,"column":14},"end":{"row":71,"column":15},"action":"insert","lines":["g"],"id":1515}],[{"start":{"row":71,"column":15},"end":{"row":71,"column":16},"action":"insert","lines":["e"],"id":1516}],[{"start":{"row":71,"column":16},"end":{"row":71,"column":17},"action":"insert","lines":["t"],"id":1517}],[{"start":{"row":71,"column":17},"end":{"row":71,"column":18},"action":"insert","lines":["P"],"id":1518}],[{"start":{"row":63,"column":14},"end":{"row":63,"column":15},"action":"remove","lines":["p"],"id":1519}],[{"start":{"row":63,"column":14},"end":{"row":63,"column":15},"action":"insert","lines":["g"],"id":1520}],[{"start":{"row":63,"column":15},"end":{"row":63,"column":16},"action":"insert","lines":["e"],"id":1521}],[{"start":{"row":63,"column":16},"end":{"row":63,"column":17},"action":"insert","lines":["t"],"id":1522}],[{"start":{"row":63,"column":17},"end":{"row":63,"column":18},"action":"insert","lines":["P"],"id":1523}],[{"start":{"row":63,"column":17},"end":{"row":63,"column":18},"action":"remove","lines":["P"],"id":1524}],[{"start":{"row":63,"column":16},"end":{"row":63,"column":17},"action":"remove","lines":["t"],"id":1525}],[{"start":{"row":63,"column":15},"end":{"row":63,"column":16},"action":"remove","lines":["e"],"id":1526}],[{"start":{"row":63,"column":14},"end":{"row":63,"column":15},"action":"remove","lines":["g"],"id":1527}],[{"start":{"row":63,"column":14},"end":{"row":63,"column":15},"action":"insert","lines":["p"],"id":1528}],[{"start":{"row":71,"column":14},"end":{"row":71,"column":18},"action":"remove","lines":["getP"],"id":1529},{"start":{"row":71,"column":14},"end":{"row":71,"column":15},"action":"insert","lines":["p"]}],[{"start":{"row":8,"column":43},"end":{"row":9,"column":39},"action":"remove","lines":["","use App\\Repositories\\ProductRepository;"],"id":1530}],[{"start":{"row":10,"column":28},"end":{"row":11,"column":0},"action":"insert","lines":["",""],"id":1531}],[{"start":{"row":11,"column":0},"end":{"row":11,"column":1},"action":"insert","lines":["u"],"id":1532}],[{"start":{"row":11,"column":1},"end":{"row":11,"column":2},"action":"insert","lines":["s"],"id":1533}],[{"start":{"row":11,"column":2},"end":{"row":11,"column":3},"action":"insert","lines":["e"],"id":1534}],[{"start":{"row":11,"column":3},"end":{"row":11,"column":4},"action":"insert","lines":[" "],"id":1535}],[{"start":{"row":11,"column":4},"end":{"row":11,"column":5},"action":"insert","lines":["C"],"id":1536}],[{"start":{"row":11,"column":5},"end":{"row":11,"column":6},"action":"insert","lines":["a"],"id":1537}],[{"start":{"row":11,"column":6},"end":{"row":11,"column":7},"action":"insert","lines":["r"],"id":1538}],[{"start":{"row":11,"column":7},"end":{"row":11,"column":8},"action":"insert","lines":["b"],"id":1539}],[{"start":{"row":11,"column":8},"end":{"row":11,"column":9},"action":"insert","lines":["o"],"id":1540}],[{"start":{"row":11,"column":9},"end":{"row":11,"column":10},"action":"insert","lines":["n"],"id":1541}],[{"start":{"row":11,"column":10},"end":{"row":11,"column":11},"action":"insert","lines":["\\"],"id":1542}],[{"start":{"row":11,"column":11},"end":{"row":11,"column":12},"action":"insert","lines":["C"],"id":1543}],[{"start":{"row":11,"column":12},"end":{"row":11,"column":13},"action":"insert","lines":["a"],"id":1544}],[{"start":{"row":11,"column":13},"end":{"row":11,"column":14},"action":"insert","lines":["r"],"id":1545}],[{"start":{"row":11,"column":14},"end":{"row":11,"column":15},"action":"insert","lines":["b"],"id":1546}],[{"start":{"row":11,"column":15},"end":{"row":11,"column":16},"action":"insert","lines":["o"],"id":1547}],[{"start":{"row":11,"column":16},"end":{"row":11,"column":17},"action":"insert","lines":["n"],"id":1548}],[{"start":{"row":11,"column":17},"end":{"row":11,"column":18},"action":"insert","lines":[";"],"id":1549}],[{"start":{"row":70,"column":51},"end":{"row":71,"column":0},"action":"insert","lines":["",""],"id":1550},{"start":{"row":71,"column":0},"end":{"row":71,"column":12},"action":"insert","lines":[" "]}],[{"start":{"row":71,"column":12},"end":{"row":71,"column":75},"action":"insert","lines":["->whereDate('expire_at', '>=', Carbon::today()->toDateString())"],"id":1551}],[{"start":{"row":71,"column":25},"end":{"row":71,"column":26},"action":"insert","lines":["p"],"id":1552}],[{"start":{"row":71,"column":26},"end":{"row":71,"column":27},"action":"insert","lines":["r"],"id":1553}],[{"start":{"row":71,"column":27},"end":{"row":71,"column":28},"action":"insert","lines":["o"],"id":1554}],[{"start":{"row":71,"column":28},"end":{"row":71,"column":29},"action":"insert","lines":["d"],"id":1555}],[{"start":{"row":71,"column":29},"end":{"row":71,"column":30},"action":"insert","lines":["u"],"id":1556}],[{"start":{"row":71,"column":30},"end":{"row":71,"column":31},"action":"insert","lines":["c"],"id":1557}],[{"start":{"row":71,"column":31},"end":{"row":71,"column":32},"action":"insert","lines":["t"],"id":1558}],[{"start":{"row":71,"column":32},"end":{"row":71,"column":33},"action":"insert","lines":["s"],"id":1559}],[{"start":{"row":71,"column":33},"end":{"row":71,"column":34},"action":"insert","lines":["."],"id":1560}],[{"start":{"row":62,"column":56},"end":{"row":63,"column":0},"action":"insert","lines":["",""],"id":1561},{"start":{"row":63,"column":0},"end":{"row":63,"column":12},"action":"insert","lines":[" "]}],[{"start":{"row":63,"column":12},"end":{"row":63,"column":75},"action":"insert","lines":["->whereDate('expire_at', '>=', Carbon::today()->toDateString())"],"id":1562}],[{"start":{"row":63,"column":25},"end":{"row":63,"column":26},"action":"insert","lines":["p"],"id":1563}],[{"start":{"row":63,"column":26},"end":{"row":63,"column":27},"action":"insert","lines":["r"],"id":1564}],[{"start":{"row":63,"column":27},"end":{"row":63,"column":28},"action":"insert","lines":["o"],"id":1565}],[{"start":{"row":63,"column":28},"end":{"row":63,"column":29},"action":"insert","lines":["d"],"id":1566}],[{"start":{"row":63,"column":29},"end":{"row":63,"column":30},"action":"insert","lines":["u"],"id":1567}],[{"start":{"row":63,"column":30},"end":{"row":63,"column":31},"action":"insert","lines":["c"],"id":1568}],[{"start":{"row":63,"column":31},"end":{"row":63,"column":32},"action":"insert","lines":["t"],"id":1569}],[{"start":{"row":63,"column":32},"end":{"row":63,"column":33},"action":"insert","lines":["s"],"id":1570}],[{"start":{"row":63,"column":33},"end":{"row":63,"column":34},"action":"insert","lines":["."],"id":1571}]]},"ace":{"folds":[],"scrolltop":528,"scrollleft":0,"selection":{"start":{"row":44,"column":2},"end":{"row":44,"column":2},"isBackwards":true},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0},"timestamp":1513586506043,"hash":"2cf1af03bda142061884605d40e46de7e680e53b"}
\ No newline at end of file
diff --git a/workspace/.c9/metadata/workspace/app/Http/routes.php b/workspace/.c9/metadata/workspace/app/Http/routes.php
index 9c7b1190926936f29b8ad38860446cc9a79d52f4..f4cd5bad5258de707492a3a5cb7fabfdc24456fb 100644
--- a/workspace/.c9/metadata/workspace/app/Http/routes.php
+++ b/workspace/.c9/metadata/workspace/app/Http/routes.php
@@ -1 +1 @@
-{"filter":false,"title":"routes.php","tooltip":"/app/Http/routes.php","undoManager":{"mark":30,"position":30,"stack":[[{"start":{"row":64,"column":104},"end":{"row":65,"column":0},"action":"insert","lines":["",""],"id":379}],[{"start":{"row":65,"column":0},"end":{"row":66,"column":0},"action":"insert","lines":["",""],"id":380}],[{"start":{"row":66,"column":0},"end":{"row":66,"column":104},"action":"insert","lines":["Route::get('reservations/{product}/{user}','ReservationsController@create')->name('reservations.store');"],"id":381}],[{"start":{"row":66,"column":67},"end":{"row":66,"column":73},"action":"remove","lines":["create"],"id":382},{"start":{"row":66,"column":67},"end":{"row":66,"column":68},"action":"insert","lines":["d"]}],[{"start":{"row":66,"column":68},"end":{"row":66,"column":69},"action":"insert","lines":["s"],"id":383}],[{"start":{"row":66,"column":68},"end":{"row":66,"column":69},"action":"remove","lines":["s"],"id":384}],[{"start":{"row":66,"column":68},"end":{"row":66,"column":69},"action":"insert","lines":["e"],"id":385}],[{"start":{"row":66,"column":69},"end":{"row":66,"column":70},"action":"insert","lines":["s"],"id":386}],[{"start":{"row":66,"column":70},"end":{"row":66,"column":71},"action":"insert","lines":["t"],"id":387}],[{"start":{"row":66,"column":71},"end":{"row":66,"column":72},"action":"insert","lines":["r"],"id":388}],[{"start":{"row":66,"column":72},"end":{"row":66,"column":73},"action":"insert","lines":["o"],"id":389}],[{"start":{"row":66,"column":73},"end":{"row":66,"column":74},"action":"insert","lines":["t"],"id":390}],[{"start":{"row":66,"column":73},"end":{"row":66,"column":74},"action":"remove","lines":["t"],"id":391}],[{"start":{"row":66,"column":73},"end":{"row":66,"column":74},"action":"insert","lines":["y"],"id":392}],[{"start":{"row":66,"column":101},"end":{"row":66,"column":102},"action":"remove","lines":["e"],"id":393}],[{"start":{"row":66,"column":100},"end":{"row":66,"column":101},"action":"remove","lines":["r"],"id":394}],[{"start":{"row":66,"column":99},"end":{"row":66,"column":100},"action":"remove","lines":["o"],"id":395}],[{"start":{"row":66,"column":98},"end":{"row":66,"column":99},"action":"remove","lines":["t"],"id":396}],[{"start":{"row":66,"column":97},"end":{"row":66,"column":98},"action":"remove","lines":["s"],"id":397}],[{"start":{"row":66,"column":97},"end":{"row":66,"column":98},"action":"insert","lines":["d"],"id":398}],[{"start":{"row":66,"column":98},"end":{"row":66,"column":99},"action":"insert","lines":["e"],"id":399}],[{"start":{"row":66,"column":99},"end":{"row":66,"column":100},"action":"insert","lines":["s"],"id":400}],[{"start":{"row":66,"column":99},"end":{"row":66,"column":100},"action":"remove","lines":["s"],"id":401}],[{"start":{"row":66,"column":99},"end":{"row":66,"column":100},"action":"insert","lines":["l"],"id":402}],[{"start":{"row":66,"column":100},"end":{"row":66,"column":101},"action":"insert","lines":["e"],"id":403}],[{"start":{"row":66,"column":101},"end":{"row":66,"column":102},"action":"insert","lines":["t"],"id":404}],[{"start":{"row":66,"column":102},"end":{"row":66,"column":103},"action":"insert","lines":["e"],"id":405}],[{"start":{"row":66,"column":25},"end":{"row":66,"column":41},"action":"remove","lines":["{product}/{user}"],"id":406},{"start":{"row":66,"column":25},"end":{"row":66,"column":26},"action":"insert","lines":["i"]}],[{"start":{"row":66,"column":26},"end":{"row":66,"column":27},"action":"insert","lines":["d"],"id":407}],[{"start":{"row":66,"column":27},"end":{"row":66,"column":28},"action":"insert","lines":["}"],"id":408}],[{"start":{"row":66,"column":25},"end":{"row":66,"column":26},"action":"insert","lines":["{"],"id":409}]]},"ace":{"folds":[],"scrolltop":60,"scrollleft":0,"selection":{"start":{"row":25,"column":16},"end":{"row":25,"column":26},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":34,"state":"php-start","mode":"ace/mode/php"}},"timestamp":1513549971826,"hash":"a56dbea52801d22af7d13f498a507f8adee7dd03"}
\ No newline at end of file
+{"filter":false,"title":"routes.php","tooltip":"/app/Http/routes.php","undoManager":{"mark":30,"position":30,"stack":[[{"start":{"row":64,"column":104},"end":{"row":65,"column":0},"action":"insert","lines":["",""],"id":379}],[{"start":{"row":65,"column":0},"end":{"row":66,"column":0},"action":"insert","lines":["",""],"id":380}],[{"start":{"row":66,"column":0},"end":{"row":66,"column":104},"action":"insert","lines":["Route::get('reservations/{product}/{user}','ReservationsController@create')->name('reservations.store');"],"id":381}],[{"start":{"row":66,"column":67},"end":{"row":66,"column":73},"action":"remove","lines":["create"],"id":382},{"start":{"row":66,"column":67},"end":{"row":66,"column":68},"action":"insert","lines":["d"]}],[{"start":{"row":66,"column":68},"end":{"row":66,"column":69},"action":"insert","lines":["s"],"id":383}],[{"start":{"row":66,"column":68},"end":{"row":66,"column":69},"action":"remove","lines":["s"],"id":384}],[{"start":{"row":66,"column":68},"end":{"row":66,"column":69},"action":"insert","lines":["e"],"id":385}],[{"start":{"row":66,"column":69},"end":{"row":66,"column":70},"action":"insert","lines":["s"],"id":386}],[{"start":{"row":66,"column":70},"end":{"row":66,"column":71},"action":"insert","lines":["t"],"id":387}],[{"start":{"row":66,"column":71},"end":{"row":66,"column":72},"action":"insert","lines":["r"],"id":388}],[{"start":{"row":66,"column":72},"end":{"row":66,"column":73},"action":"insert","lines":["o"],"id":389}],[{"start":{"row":66,"column":73},"end":{"row":66,"column":74},"action":"insert","lines":["t"],"id":390}],[{"start":{"row":66,"column":73},"end":{"row":66,"column":74},"action":"remove","lines":["t"],"id":391}],[{"start":{"row":66,"column":73},"end":{"row":66,"column":74},"action":"insert","lines":["y"],"id":392}],[{"start":{"row":66,"column":101},"end":{"row":66,"column":102},"action":"remove","lines":["e"],"id":393}],[{"start":{"row":66,"column":100},"end":{"row":66,"column":101},"action":"remove","lines":["r"],"id":394}],[{"start":{"row":66,"column":99},"end":{"row":66,"column":100},"action":"remove","lines":["o"],"id":395}],[{"start":{"row":66,"column":98},"end":{"row":66,"column":99},"action":"remove","lines":["t"],"id":396}],[{"start":{"row":66,"column":97},"end":{"row":66,"column":98},"action":"remove","lines":["s"],"id":397}],[{"start":{"row":66,"column":97},"end":{"row":66,"column":98},"action":"insert","lines":["d"],"id":398}],[{"start":{"row":66,"column":98},"end":{"row":66,"column":99},"action":"insert","lines":["e"],"id":399}],[{"start":{"row":66,"column":99},"end":{"row":66,"column":100},"action":"insert","lines":["s"],"id":400}],[{"start":{"row":66,"column":99},"end":{"row":66,"column":100},"action":"remove","lines":["s"],"id":401}],[{"start":{"row":66,"column":99},"end":{"row":66,"column":100},"action":"insert","lines":["l"],"id":402}],[{"start":{"row":66,"column":100},"end":{"row":66,"column":101},"action":"insert","lines":["e"],"id":403}],[{"start":{"row":66,"column":101},"end":{"row":66,"column":102},"action":"insert","lines":["t"],"id":404}],[{"start":{"row":66,"column":102},"end":{"row":66,"column":103},"action":"insert","lines":["e"],"id":405}],[{"start":{"row":66,"column":25},"end":{"row":66,"column":41},"action":"remove","lines":["{product}/{user}"],"id":406},{"start":{"row":66,"column":25},"end":{"row":66,"column":26},"action":"insert","lines":["i"]}],[{"start":{"row":66,"column":26},"end":{"row":66,"column":27},"action":"insert","lines":["d"],"id":407}],[{"start":{"row":66,"column":27},"end":{"row":66,"column":28},"action":"insert","lines":["}"],"id":408}],[{"start":{"row":66,"column":25},"end":{"row":66,"column":26},"action":"insert","lines":["{"],"id":409}]]},"ace":{"folds":[],"scrolltop":60,"scrollleft":0,"selection":{"start":{"row":25,"column":16},"end":{"row":25,"column":26},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0},"timestamp":1513549971826,"hash":"a56dbea52801d22af7d13f498a507f8adee7dd03"}
\ No newline at end of file
diff --git a/workspace/.c9/metadata/workspace/app/Repositories/ProductRepository.php b/workspace/.c9/metadata/workspace/app/Repositories/ProductRepository.php
index 1966e8f44e7df4f8cb04c3e0cc021e27447511d4..47efc23783bd0bec5e672c344402c1a3f0eeb2f9 100644
--- a/workspace/.c9/metadata/workspace/app/Repositories/ProductRepository.php
+++ b/workspace/.c9/metadata/workspace/app/Repositories/ProductRepository.php
@@ -1 +1 @@
-{"filter":false,"title":"ProductRepository.php","tooltip":"/app/Repositories/ProductRepository.php","undoManager":{"mark":-1,"position":-1,"stack":[]},"ace":{"folds":[],"scrolltop":1401,"scrollleft":0,"selection":{"start":{"row":115,"column":36},"end":{"row":115,"column":36},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":62,"state":"php-start","mode":"ace/mode/php"}},"timestamp":1513548507296,"hash":"6f08f9d52ca68bbd943f1c6147aef77d3b15017f"}
\ No newline at end of file
+{"filter":false,"title":"ProductRepository.php","tooltip":"/app/Repositories/ProductRepository.php","undoManager":{"mark":18,"position":18,"stack":[[{"start":{"row":50,"column":23},"end":{"row":51,"column":0},"action":"insert","lines":["",""],"id":598},{"start":{"row":51,"column":0},"end":{"row":51,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":51,"column":2},"end":{"row":51,"column":3},"action":"insert","lines":["\t"],"id":599}],[{"start":{"row":50,"column":23},"end":{"row":51,"column":0},"action":"insert","lines":["",""],"id":600},{"start":{"row":51,"column":0},"end":{"row":51,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":51,"column":2},"end":{"row":51,"column":3},"action":"insert","lines":["\t"],"id":601}],[{"start":{"row":51,"column":3},"end":{"row":51,"column":4},"action":"insert","lines":["-"],"id":602}],[{"start":{"row":51,"column":4},"end":{"row":51,"column":5},"action":"insert","lines":[">"],"id":603}],[{"start":{"row":51,"column":5},"end":{"row":51,"column":6},"action":"insert","lines":["w"],"id":604}],[{"start":{"row":51,"column":6},"end":{"row":51,"column":7},"action":"insert","lines":["h"],"id":605}],[{"start":{"row":51,"column":7},"end":{"row":51,"column":8},"action":"insert","lines":["e"],"id":606}],[{"start":{"row":51,"column":8},"end":{"row":51,"column":9},"action":"insert","lines":["r"],"id":607}],[{"start":{"row":51,"column":9},"end":{"row":51,"column":10},"action":"insert","lines":["e"],"id":608}],[{"start":{"row":51,"column":10},"end":{"row":51,"column":12},"action":"insert","lines":["()"],"id":609}],[{"start":{"row":51,"column":10},"end":{"row":51,"column":11},"action":"insert","lines":["D"],"id":610}],[{"start":{"row":51,"column":11},"end":{"row":51,"column":12},"action":"insert","lines":["a"],"id":611}],[{"start":{"row":51,"column":12},"end":{"row":51,"column":13},"action":"insert","lines":["t"],"id":612}],[{"start":{"row":51,"column":13},"end":{"row":51,"column":14},"action":"insert","lines":["a"],"id":613}],[{"start":{"row":51,"column":13},"end":{"row":51,"column":14},"action":"remove","lines":["a"],"id":614}],[{"start":{"row":51,"column":13},"end":{"row":51,"column":14},"action":"insert","lines":["e"],"id":615}],[{"start":{"row":51,"column":15},"end":{"row":51,"column":65},"action":"insert","lines":["'expire_at', '>=', Carbon::today()->toDateString()"],"id":616}]]},"ace":{"folds":[],"scrolltop":267,"scrollleft":0,"selection":{"start":{"row":51,"column":22},"end":{"row":51,"column":22},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0},"timestamp":1513586309299,"hash":"e2da6a14d2c4bed163a2d6b63b81b3f612dc94e8"}
\ No newline at end of file
diff --git a/workspace/.c9/metadata/workspace/database/migrations/2017_11_08_233536_create_product_table.php b/workspace/.c9/metadata/workspace/database/migrations/2017_11_08_233536_create_product_table.php
index e21bfd645277bc002f1ce4d0477fd752041572de..ab6c6980a82ecc1cc5b5ca87b00267677f0fe3e9 100644
--- a/workspace/.c9/metadata/workspace/database/migrations/2017_11_08_233536_create_product_table.php
+++ b/workspace/.c9/metadata/workspace/database/migrations/2017_11_08_233536_create_product_table.php
@@ -1 +1 @@
-{"filter":false,"title":"2017_11_08_233536_create_product_table.php","tooltip":"/database/migrations/2017_11_08_233536_create_product_table.php","undoManager":{"mark":67,"position":67,"stack":[[{"start":{"row":32,"column":31},"end":{"row":33,"column":0},"action":"insert","lines":["",""],"id":1},{"start":{"row":33,"column":0},"end":{"row":33,"column":6},"action":"insert","lines":[" \t\t"]}],[{"start":{"row":33,"column":6},"end":{"row":33,"column":7},"action":"insert","lines":["$"],"id":2}],[{"start":{"row":33,"column":7},"end":{"row":33,"column":8},"action":"insert","lines":["t"],"id":3}],[{"start":{"row":33,"column":8},"end":{"row":33,"column":9},"action":"insert","lines":["a"],"id":4}],[{"start":{"row":33,"column":9},"end":{"row":33,"column":10},"action":"insert","lines":["b"],"id":5}],[{"start":{"row":33,"column":10},"end":{"row":33,"column":11},"action":"insert","lines":["l"],"id":6}],[{"start":{"row":33,"column":11},"end":{"row":33,"column":12},"action":"insert","lines":["e"],"id":7}],[{"start":{"row":33,"column":12},"end":{"row":33,"column":13},"action":"insert","lines":["-"],"id":8}],[{"start":{"row":33,"column":13},"end":{"row":33,"column":14},"action":"insert","lines":[">"],"id":9}],[{"start":{"row":33,"column":14},"end":{"row":33,"column":15},"action":"insert","lines":["b"],"id":10}],[{"start":{"row":33,"column":15},"end":{"row":33,"column":16},"action":"insert","lines":["o"],"id":11}],[{"start":{"row":33,"column":16},"end":{"row":33,"column":17},"action":"insert","lines":["o"],"id":12}],[{"start":{"row":33,"column":17},"end":{"row":33,"column":18},"action":"insert","lines":["k"],"id":13}],[{"start":{"row":33,"column":18},"end":{"row":33,"column":19},"action":"insert","lines":["e"],"id":14}],[{"start":{"row":33,"column":19},"end":{"row":33,"column":20},"action":"insert","lines":["d"],"id":15}],[{"start":{"row":33,"column":20},"end":{"row":33,"column":22},"action":"insert","lines":["()"],"id":16}],[{"start":{"row":33,"column":21},"end":{"row":33,"column":23},"action":"insert","lines":["''"],"id":17}],[{"start":{"row":33,"column":21},"end":{"row":33,"column":23},"action":"remove","lines":["''"],"id":18}],[{"start":{"row":33,"column":20},"end":{"row":33,"column":22},"action":"remove","lines":["()"],"id":19}],[{"start":{"row":33,"column":19},"end":{"row":33,"column":20},"action":"remove","lines":["d"],"id":20}],[{"start":{"row":33,"column":18},"end":{"row":33,"column":19},"action":"remove","lines":["e"],"id":21}],[{"start":{"row":33,"column":17},"end":{"row":33,"column":18},"action":"remove","lines":["k"],"id":22}],[{"start":{"row":33,"column":16},"end":{"row":33,"column":17},"action":"remove","lines":["o"],"id":23}],[{"start":{"row":33,"column":16},"end":{"row":33,"column":17},"action":"insert","lines":["o"],"id":24}],[{"start":{"row":33,"column":17},"end":{"row":33,"column":18},"action":"insert","lines":["l"],"id":25}],[{"start":{"row":33,"column":18},"end":{"row":33,"column":19},"action":"insert","lines":["e"],"id":26}],[{"start":{"row":33,"column":19},"end":{"row":33,"column":20},"action":"insert","lines":["a"],"id":27}],[{"start":{"row":33,"column":20},"end":{"row":33,"column":21},"action":"insert","lines":["n"],"id":28}],[{"start":{"row":33,"column":21},"end":{"row":33,"column":23},"action":"insert","lines":["()"],"id":29}],[{"start":{"row":33,"column":22},"end":{"row":33,"column":24},"action":"insert","lines":["''"],"id":30}],[{"start":{"row":33,"column":23},"end":{"row":33,"column":24},"action":"insert","lines":["b"],"id":31}],[{"start":{"row":33,"column":24},"end":{"row":33,"column":25},"action":"insert","lines":["o"],"id":32}],[{"start":{"row":33,"column":25},"end":{"row":33,"column":26},"action":"insert","lines":["o"],"id":33}],[{"start":{"row":33,"column":26},"end":{"row":33,"column":27},"action":"insert","lines":["k"],"id":34}],[{"start":{"row":33,"column":27},"end":{"row":33,"column":28},"action":"insert","lines":["e"],"id":35}],[{"start":{"row":33,"column":28},"end":{"row":33,"column":29},"action":"insert","lines":["d"],"id":36}],[{"start":{"row":33,"column":31},"end":{"row":33,"column":32},"action":"insert","lines":[":"],"id":37}],[{"start":{"row":33,"column":31},"end":{"row":33,"column":32},"action":"remove","lines":[":"],"id":38}],[{"start":{"row":33,"column":31},"end":{"row":33,"column":32},"action":"insert","lines":[";"],"id":39}],[{"start":{"row":33,"column":32},"end":{"row":33,"column":33},"action":"insert","lines":[" "],"id":40}],[{"start":{"row":33,"column":33},"end":{"row":33,"column":34},"action":"insert","lines":["/"],"id":41}],[{"start":{"row":33,"column":34},"end":{"row":33,"column":35},"action":"insert","lines":["/"],"id":42}],[{"start":{"row":33,"column":35},"end":{"row":33,"column":36},"action":"insert","lines":[" "],"id":43}],[{"start":{"row":33,"column":36},"end":{"row":33,"column":37},"action":"insert","lines":["s"],"id":44}],[{"start":{"row":33,"column":37},"end":{"row":33,"column":38},"action":"insert","lines":["i"],"id":45}],[{"start":{"row":33,"column":38},"end":{"row":33,"column":39},"action":"insert","lines":[" "],"id":46}],[{"start":{"row":33,"column":39},"end":{"row":33,"column":40},"action":"insert","lines":["l"],"id":47}],[{"start":{"row":33,"column":40},"end":{"row":33,"column":41},"action":"insert","lines":["e"],"id":48}],[{"start":{"row":33,"column":41},"end":{"row":33,"column":42},"action":"insert","lines":[" "],"id":49}],[{"start":{"row":33,"column":42},"end":{"row":33,"column":43},"action":"insert","lines":["p"],"id":50}],[{"start":{"row":33,"column":43},"end":{"row":33,"column":44},"action":"insert","lines":["r"],"id":51}],[{"start":{"row":33,"column":44},"end":{"row":33,"column":45},"action":"insert","lines":["o"],"id":52}],[{"start":{"row":33,"column":45},"end":{"row":33,"column":46},"action":"insert","lines":["d"],"id":53}],[{"start":{"row":33,"column":46},"end":{"row":33,"column":47},"action":"insert","lines":["u"],"id":54}],[{"start":{"row":33,"column":47},"end":{"row":33,"column":48},"action":"insert","lines":["i"],"id":55}],[{"start":{"row":33,"column":48},"end":{"row":33,"column":49},"action":"insert","lines":["t"],"id":56}],[{"start":{"row":33,"column":49},"end":{"row":33,"column":50},"action":"insert","lines":[" "],"id":57}],[{"start":{"row":33,"column":50},"end":{"row":33,"column":51},"action":"insert","lines":["e"],"id":58}],[{"start":{"row":33,"column":51},"end":{"row":33,"column":52},"action":"insert","lines":["s"],"id":59}],[{"start":{"row":33,"column":52},"end":{"row":33,"column":53},"action":"insert","lines":["t"],"id":60}],[{"start":{"row":33,"column":53},"end":{"row":33,"column":54},"action":"insert","lines":[" "],"id":61}],[{"start":{"row":33,"column":54},"end":{"row":33,"column":55},"action":"insert","lines":["r"],"id":62}],[{"start":{"row":33,"column":55},"end":{"row":33,"column":56},"action":"insert","lines":["é"],"id":63}],[{"start":{"row":33,"column":56},"end":{"row":33,"column":57},"action":"insert","lines":["s"],"id":64}],[{"start":{"row":33,"column":57},"end":{"row":33,"column":58},"action":"insert","lines":["e"],"id":65}],[{"start":{"row":33,"column":58},"end":{"row":33,"column":59},"action":"insert","lines":["r"],"id":66}],[{"start":{"row":33,"column":59},"end":{"row":33,"column":60},"action":"insert","lines":["v"],"id":67}],[{"start":{"row":33,"column":60},"end":{"row":33,"column":61},"action":"insert","lines":["é"],"id":68}]]},"ace":{"folds":[],"scrolltop":178.90000000000018,"scrollleft":0,"selection":{"start":{"row":33,"column":23},"end":{"row":33,"column":29},"isBackwards":true},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":13,"state":"php-doc-start","mode":"ace/mode/php"}},"timestamp":1513443067208,"hash":"19d9c0e258198deb2a6006ef261373eed8d85533"}
\ No newline at end of file
+{"filter":false,"title":"2017_11_08_233536_create_product_table.php","tooltip":"/database/migrations/2017_11_08_233536_create_product_table.php","ace":{"folds":[],"scrolltop":178.90000000000018,"scrollleft":0,"selection":{"start":{"row":33,"column":23},"end":{"row":33,"column":29},"isBackwards":true},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":13,"state":"php-doc-start","mode":"ace/mode/php"}},"hash":"19d9c0e258198deb2a6006ef261373eed8d85533","undoManager":{"mark":67,"position":67,"stack":[[{"start":{"row":32,"column":31},"end":{"row":33,"column":0},"action":"insert","lines":["",""],"id":1},{"start":{"row":33,"column":0},"end":{"row":33,"column":6},"action":"insert","lines":[" \t\t"]}],[{"start":{"row":33,"column":6},"end":{"row":33,"column":7},"action":"insert","lines":["$"],"id":2}],[{"start":{"row":33,"column":7},"end":{"row":33,"column":8},"action":"insert","lines":["t"],"id":3}],[{"start":{"row":33,"column":8},"end":{"row":33,"column":9},"action":"insert","lines":["a"],"id":4}],[{"start":{"row":33,"column":9},"end":{"row":33,"column":10},"action":"insert","lines":["b"],"id":5}],[{"start":{"row":33,"column":10},"end":{"row":33,"column":11},"action":"insert","lines":["l"],"id":6}],[{"start":{"row":33,"column":11},"end":{"row":33,"column":12},"action":"insert","lines":["e"],"id":7}],[{"start":{"row":33,"column":12},"end":{"row":33,"column":13},"action":"insert","lines":["-"],"id":8}],[{"start":{"row":33,"column":13},"end":{"row":33,"column":14},"action":"insert","lines":[">"],"id":9}],[{"start":{"row":33,"column":14},"end":{"row":33,"column":15},"action":"insert","lines":["b"],"id":10}],[{"start":{"row":33,"column":15},"end":{"row":33,"column":16},"action":"insert","lines":["o"],"id":11}],[{"start":{"row":33,"column":16},"end":{"row":33,"column":17},"action":"insert","lines":["o"],"id":12}],[{"start":{"row":33,"column":17},"end":{"row":33,"column":18},"action":"insert","lines":["k"],"id":13}],[{"start":{"row":33,"column":18},"end":{"row":33,"column":19},"action":"insert","lines":["e"],"id":14}],[{"start":{"row":33,"column":19},"end":{"row":33,"column":20},"action":"insert","lines":["d"],"id":15}],[{"start":{"row":33,"column":20},"end":{"row":33,"column":22},"action":"insert","lines":["()"],"id":16}],[{"start":{"row":33,"column":21},"end":{"row":33,"column":23},"action":"insert","lines":["''"],"id":17}],[{"start":{"row":33,"column":21},"end":{"row":33,"column":23},"action":"remove","lines":["''"],"id":18}],[{"start":{"row":33,"column":20},"end":{"row":33,"column":22},"action":"remove","lines":["()"],"id":19}],[{"start":{"row":33,"column":19},"end":{"row":33,"column":20},"action":"remove","lines":["d"],"id":20}],[{"start":{"row":33,"column":18},"end":{"row":33,"column":19},"action":"remove","lines":["e"],"id":21}],[{"start":{"row":33,"column":17},"end":{"row":33,"column":18},"action":"remove","lines":["k"],"id":22}],[{"start":{"row":33,"column":16},"end":{"row":33,"column":17},"action":"remove","lines":["o"],"id":23}],[{"start":{"row":33,"column":16},"end":{"row":33,"column":17},"action":"insert","lines":["o"],"id":24}],[{"start":{"row":33,"column":17},"end":{"row":33,"column":18},"action":"insert","lines":["l"],"id":25}],[{"start":{"row":33,"column":18},"end":{"row":33,"column":19},"action":"insert","lines":["e"],"id":26}],[{"start":{"row":33,"column":19},"end":{"row":33,"column":20},"action":"insert","lines":["a"],"id":27}],[{"start":{"row":33,"column":20},"end":{"row":33,"column":21},"action":"insert","lines":["n"],"id":28}],[{"start":{"row":33,"column":21},"end":{"row":33,"column":23},"action":"insert","lines":["()"],"id":29}],[{"start":{"row":33,"column":22},"end":{"row":33,"column":24},"action":"insert","lines":["''"],"id":30}],[{"start":{"row":33,"column":23},"end":{"row":33,"column":24},"action":"insert","lines":["b"],"id":31}],[{"start":{"row":33,"column":24},"end":{"row":33,"column":25},"action":"insert","lines":["o"],"id":32}],[{"start":{"row":33,"column":25},"end":{"row":33,"column":26},"action":"insert","lines":["o"],"id":33}],[{"start":{"row":33,"column":26},"end":{"row":33,"column":27},"action":"insert","lines":["k"],"id":34}],[{"start":{"row":33,"column":27},"end":{"row":33,"column":28},"action":"insert","lines":["e"],"id":35}],[{"start":{"row":33,"column":28},"end":{"row":33,"column":29},"action":"insert","lines":["d"],"id":36}],[{"start":{"row":33,"column":31},"end":{"row":33,"column":32},"action":"insert","lines":[":"],"id":37}],[{"start":{"row":33,"column":31},"end":{"row":33,"column":32},"action":"remove","lines":[":"],"id":38}],[{"start":{"row":33,"column":31},"end":{"row":33,"column":32},"action":"insert","lines":[";"],"id":39}],[{"start":{"row":33,"column":32},"end":{"row":33,"column":33},"action":"insert","lines":[" "],"id":40}],[{"start":{"row":33,"column":33},"end":{"row":33,"column":34},"action":"insert","lines":["/"],"id":41}],[{"start":{"row":33,"column":34},"end":{"row":33,"column":35},"action":"insert","lines":["/"],"id":42}],[{"start":{"row":33,"column":35},"end":{"row":33,"column":36},"action":"insert","lines":[" "],"id":43}],[{"start":{"row":33,"column":36},"end":{"row":33,"column":37},"action":"insert","lines":["s"],"id":44}],[{"start":{"row":33,"column":37},"end":{"row":33,"column":38},"action":"insert","lines":["i"],"id":45}],[{"start":{"row":33,"column":38},"end":{"row":33,"column":39},"action":"insert","lines":[" "],"id":46}],[{"start":{"row":33,"column":39},"end":{"row":33,"column":40},"action":"insert","lines":["l"],"id":47}],[{"start":{"row":33,"column":40},"end":{"row":33,"column":41},"action":"insert","lines":["e"],"id":48}],[{"start":{"row":33,"column":41},"end":{"row":33,"column":42},"action":"insert","lines":[" "],"id":49}],[{"start":{"row":33,"column":42},"end":{"row":33,"column":43},"action":"insert","lines":["p"],"id":50}],[{"start":{"row":33,"column":43},"end":{"row":33,"column":44},"action":"insert","lines":["r"],"id":51}],[{"start":{"row":33,"column":44},"end":{"row":33,"column":45},"action":"insert","lines":["o"],"id":52}],[{"start":{"row":33,"column":45},"end":{"row":33,"column":46},"action":"insert","lines":["d"],"id":53}],[{"start":{"row":33,"column":46},"end":{"row":33,"column":47},"action":"insert","lines":["u"],"id":54}],[{"start":{"row":33,"column":47},"end":{"row":33,"column":48},"action":"insert","lines":["i"],"id":55}],[{"start":{"row":33,"column":48},"end":{"row":33,"column":49},"action":"insert","lines":["t"],"id":56}],[{"start":{"row":33,"column":49},"end":{"row":33,"column":50},"action":"insert","lines":[" "],"id":57}],[{"start":{"row":33,"column":50},"end":{"row":33,"column":51},"action":"insert","lines":["e"],"id":58}],[{"start":{"row":33,"column":51},"end":{"row":33,"column":52},"action":"insert","lines":["s"],"id":59}],[{"start":{"row":33,"column":52},"end":{"row":33,"column":53},"action":"insert","lines":["t"],"id":60}],[{"start":{"row":33,"column":53},"end":{"row":33,"column":54},"action":"insert","lines":[" "],"id":61}],[{"start":{"row":33,"column":54},"end":{"row":33,"column":55},"action":"insert","lines":["r"],"id":62}],[{"start":{"row":33,"column":55},"end":{"row":33,"column":56},"action":"insert","lines":["é"],"id":63}],[{"start":{"row":33,"column":56},"end":{"row":33,"column":57},"action":"insert","lines":["s"],"id":64}],[{"start":{"row":33,"column":57},"end":{"row":33,"column":58},"action":"insert","lines":["e"],"id":65}],[{"start":{"row":33,"column":58},"end":{"row":33,"column":59},"action":"insert","lines":["r"],"id":66}],[{"start":{"row":33,"column":59},"end":{"row":33,"column":60},"action":"insert","lines":["v"],"id":67}],[{"start":{"row":33,"column":60},"end":{"row":33,"column":61},"action":"insert","lines":["é"],"id":68}]]},"timestamp":1513443067208}
\ No newline at end of file
diff --git a/workspace/.c9/metadata/workspace/reports/iteration_2.md b/workspace/.c9/metadata/workspace/reports/iteration_2.md
index 155de8a5b19ae8b94d033ee694b6feaa3e4344ac..b9c6497e9617822ee5ec19e1e1ba7cb082c76ca1 100644
--- a/workspace/.c9/metadata/workspace/reports/iteration_2.md
+++ b/workspace/.c9/metadata/workspace/reports/iteration_2.md
@@ -1 +1 @@
-{"changed":true,"filter":false,"title":"iteration_2.md","tooltip":"/reports/iteration_2.md","value":"# Rapport d'itération \n\n## Composition de l'équipe \n\n\n| | Itération précédente |\n| ------------- |------------- |\n| **Product Owner** | *AICHHORN Guillaume* |\n| **Scrum Master** | *ALVES Alexandre* |\n| **Dev**\t\t \t\t | *KIM Hyoseok*\t\t\t |\n| **Dev**\t\t \t\t | *ALIMEHNNI Hugues*\t\t |\n| **Dev**\t\t \t\t | *SANN Sokchivin*\t\t |\n| **Dev**\t\t \t\t | *BENCHETRIT Milan*\t\t |\n| **Dev**\t\t \t\t | *MELCHIOR Louis*\t\t |\n\n## Bilan de l'itération précédente \n### Évènements \n*Quels sont les évènements qui ont marqué l'itération précédente? Répertoriez ici les évènements qui ont eu un impact sur ce qui était prévu à l'itération précédente.*\n> Guillaume n'était pas très disponible du fait de sa participation aux élections du BDE\n> L'équipe manquait d'organisation et a donc eu du mal à se mettre au travail (tâches définies mais mal réparties)\n\n### Taux de complétion de l'itération \n*Quel est le nombre d'éléments terminés par rapport au nombre total d'éléments prévu pour l'itération?*\n> 4 terminées / 7 prévues = 57%\n\n### Liste des User Stories terminées\n> Dépot d'annonce\n> Affichage des annonces (ensemble et individuel)\n\n## Rétrospective de l'itération précédente\n \n### Bilans des retours et des précédentes actions \n> Manque d'organisations et de communication : les membres de l'équipe ne savait pas quoi faire\n> Pas assez de stand up et état d'avancé du projet\n> Les USs étaient trop vagues et n'avaient pas été étudiées\n> Mauvaise compréhension des membres de l'équipe.\n> Difficultés à prendre en mains Laravel (nouvel environnement de travail)\n\n### Actions prises pour la prochaine itération\n> Meilleure communication (plus de réunion)\n> Meilleure plannification des tâches (répartition et objectifs)\n> US de plus petite taille.\n> Meilleur découpage des US.\n> Nouvel axe de travail (recentré sur le MVP)\n\n### Axes d'améliorations \n> PO : Doit être plus investi dans les prises de décisions concernant l'orientation du projet\n> - Conception/modification d'US.\n> - Définir la valeur de chaque US.\n> SM : Doit être un élement clé pour la cohésion et la communication au sein de l'équipe\n> - Moins animer les réunion mais doit maintenir l'égalité entre membres\n> Dev : Doivent être plus présents dans la réalisation du projet, n'hésitant pas à faire part de leurs problèmes\n\n## Prévisions de l'itération suivante \n### Évènements prévus \n> Conférence vendredi après-midi (24/11)\n> Conférence mardi matin (28/11)\n>\n### Titre des User Stories reportées \n> Fin du MVP (update, suppression d'annonce, recherche simple)\n\n### Titre des nouvelles User Stories \n> Les US reportées\n> Demande de réservation\n> Upload d'image\n\n## Confiance \n### Taux de confiance de l'équipe dans l'itération \n*Remplir le tableau sachant que :D est une confiance totale dans le fait de livrer les éléments de l'itération. Mettre le nombre de votes dans chacune des cases. Expliquer en cas de besoin.*\n\n| \t| :( \t| :| \t| :) \t| :D \t|\n|:--------:\t|:----:\t|:----:\t |:----:\t|:----:\t|\n| Equipe 7 \t| *0* \t| *3* \t | *4* \t| *0* \t|\n\n### Taux de confiance de l'équipe pour la réalisation du projet \n*Remplir le tableau sachant que :D est une confiance totale dans le fait de réaliser le projet. Mettre le nombre de votes dans chacune des cases. Expliquer en cas de besoin.*\n\n| \t| :( \t| :| \t| :) \t| :D \t|\n|:--------:\t|:----:\t|:----:\t |:----:\t|:----:\t|\n| Equipe 7 \t| *0* \t| *1* \t | *4* \t| *2* \t|\n\n \n \n","undoManager":{"mark":100,"position":100,"stack":[[{"start":{"row":58,"column":5},"end":{"row":58,"column":6},"action":"insert","lines":["f"],"id":730}],[{"start":{"row":58,"column":6},"end":{"row":58,"column":7},"action":"insert","lines":["é"],"id":731}],[{"start":{"row":58,"column":7},"end":{"row":58,"column":8},"action":"insert","lines":["r"],"id":732}],[{"start":{"row":58,"column":8},"end":{"row":58,"column":9},"action":"insert","lines":["e"],"id":733}],[{"start":{"row":58,"column":9},"end":{"row":58,"column":10},"action":"insert","lines":["n"],"id":734}],[{"start":{"row":58,"column":10},"end":{"row":58,"column":11},"action":"insert","lines":["c"],"id":735}],[{"start":{"row":58,"column":11},"end":{"row":58,"column":12},"action":"insert","lines":["e"],"id":736}],[{"start":{"row":58,"column":12},"end":{"row":58,"column":13},"action":"insert","lines":[" "],"id":737}],[{"start":{"row":58,"column":13},"end":{"row":58,"column":14},"action":"insert","lines":["c"],"id":738}],[{"start":{"row":58,"column":14},"end":{"row":58,"column":15},"action":"insert","lines":["e"],"id":739}],[{"start":{"row":58,"column":15},"end":{"row":58,"column":16},"action":"insert","lines":[" "],"id":740}],[{"start":{"row":58,"column":16},"end":{"row":58,"column":17},"action":"insert","lines":["m"],"id":741}],[{"start":{"row":58,"column":17},"end":{"row":58,"column":18},"action":"insert","lines":["i"],"id":742}],[{"start":{"row":58,"column":18},"end":{"row":58,"column":19},"action":"insert","lines":["d"],"id":743}],[{"start":{"row":58,"column":19},"end":{"row":58,"column":20},"action":"insert","lines":["i"],"id":744}],[{"start":{"row":58,"column":20},"end":{"row":59,"column":0},"action":"insert","lines":["",""],"id":745}],[{"start":{"row":59,"column":0},"end":{"row":59,"column":1},"action":"insert","lines":[">"],"id":746}],[{"start":{"row":59,"column":1},"end":{"row":59,"column":2},"action":"insert","lines":["C"],"id":747}],[{"start":{"row":59,"column":1},"end":{"row":59,"column":2},"action":"remove","lines":["C"],"id":748}],[{"start":{"row":59,"column":1},"end":{"row":59,"column":2},"action":"insert","lines":[" "],"id":749}],[{"start":{"row":59,"column":2},"end":{"row":59,"column":3},"action":"insert","lines":["C"],"id":750}],[{"start":{"row":59,"column":3},"end":{"row":59,"column":4},"action":"insert","lines":["o"],"id":751}],[{"start":{"row":59,"column":4},"end":{"row":59,"column":5},"action":"insert","lines":["n"],"id":752}],[{"start":{"row":59,"column":5},"end":{"row":59,"column":6},"action":"insert","lines":["f"],"id":753}],[{"start":{"row":59,"column":6},"end":{"row":59,"column":7},"action":"insert","lines":["é"],"id":754}],[{"start":{"row":59,"column":7},"end":{"row":59,"column":8},"action":"insert","lines":["r"],"id":755}],[{"start":{"row":59,"column":8},"end":{"row":59,"column":9},"action":"insert","lines":["e"],"id":756}],[{"start":{"row":59,"column":9},"end":{"row":59,"column":10},"action":"insert","lines":["n"],"id":757}],[{"start":{"row":59,"column":10},"end":{"row":59,"column":11},"action":"insert","lines":["c"],"id":758}],[{"start":{"row":59,"column":11},"end":{"row":59,"column":12},"action":"insert","lines":["e"],"id":759}],[{"start":{"row":59,"column":12},"end":{"row":59,"column":13},"action":"insert","lines":[" "],"id":760}],[{"start":{"row":59,"column":13},"end":{"row":59,"column":14},"action":"insert","lines":["m"],"id":761}],[{"start":{"row":59,"column":14},"end":{"row":59,"column":15},"action":"insert","lines":["a"],"id":762}],[{"start":{"row":59,"column":15},"end":{"row":59,"column":16},"action":"insert","lines":["i"],"id":763}],[{"start":{"row":59,"column":16},"end":{"row":59,"column":17},"action":"insert","lines":["n"],"id":764}],[{"start":{"row":59,"column":17},"end":{"row":59,"column":18},"action":"insert","lines":["t"],"id":765}],[{"start":{"row":59,"column":18},"end":{"row":59,"column":19},"action":"insert","lines":["e"],"id":766}],[{"start":{"row":59,"column":19},"end":{"row":59,"column":20},"action":"insert","lines":["n"],"id":767}],[{"start":{"row":59,"column":20},"end":{"row":59,"column":21},"action":"insert","lines":["a"],"id":768}],[{"start":{"row":59,"column":21},"end":{"row":59,"column":22},"action":"insert","lines":["n"],"id":769}],[{"start":{"row":59,"column":22},"end":{"row":59,"column":23},"action":"insert","lines":["t"],"id":770}],[{"start":{"row":59,"column":23},"end":{"row":60,"column":0},"action":"insert","lines":["",""],"id":771}],[{"start":{"row":60,"column":0},"end":{"row":60,"column":1},"action":"insert","lines":[">"],"id":772}],[{"start":{"row":60,"column":1},"end":{"row":60,"column":2},"action":"insert","lines":[" "],"id":773}],[{"start":{"row":60,"column":2},"end":{"row":60,"column":3},"action":"insert","lines":["C"],"id":774}],[{"start":{"row":60,"column":3},"end":{"row":60,"column":4},"action":"insert","lines":["o"],"id":775}],[{"start":{"row":60,"column":4},"end":{"row":60,"column":5},"action":"insert","lines":["n"],"id":776}],[{"start":{"row":60,"column":5},"end":{"row":60,"column":6},"action":"insert","lines":["f"],"id":777}],[{"start":{"row":60,"column":6},"end":{"row":60,"column":7},"action":"insert","lines":["é"],"id":778}],[{"start":{"row":60,"column":7},"end":{"row":60,"column":8},"action":"insert","lines":["r"],"id":779}],[{"start":{"row":60,"column":8},"end":{"row":60,"column":9},"action":"insert","lines":["e"],"id":780}],[{"start":{"row":60,"column":9},"end":{"row":60,"column":10},"action":"insert","lines":["n"],"id":781}],[{"start":{"row":60,"column":10},"end":{"row":60,"column":11},"action":"insert","lines":["c"],"id":782}],[{"start":{"row":60,"column":11},"end":{"row":60,"column":12},"action":"insert","lines":["e"],"id":783}],[{"start":{"row":60,"column":12},"end":{"row":60,"column":13},"action":"insert","lines":[" "],"id":784}],[{"start":{"row":60,"column":13},"end":{"row":60,"column":14},"action":"insert","lines":["d"],"id":785}],[{"start":{"row":60,"column":14},"end":{"row":60,"column":15},"action":"insert","lines":["a"],"id":786}],[{"start":{"row":60,"column":15},"end":{"row":60,"column":16},"action":"insert","lines":["n"],"id":787}],[{"start":{"row":60,"column":16},"end":{"row":60,"column":17},"action":"insert","lines":["s"],"id":788}],[{"start":{"row":60,"column":17},"end":{"row":60,"column":18},"action":"insert","lines":[" "],"id":789}],[{"start":{"row":60,"column":18},"end":{"row":60,"column":19},"action":"insert","lines":["5"],"id":790}],[{"start":{"row":60,"column":19},"end":{"row":60,"column":20},"action":"insert","lines":[" "],"id":791}],[{"start":{"row":60,"column":20},"end":{"row":60,"column":21},"action":"insert","lines":["m"],"id":792}],[{"start":{"row":60,"column":21},"end":{"row":60,"column":22},"action":"insert","lines":["i"],"id":793}],[{"start":{"row":60,"column":22},"end":{"row":60,"column":23},"action":"insert","lines":["n"],"id":794}],[{"start":{"row":58,"column":0},"end":{"row":61,"column":0},"action":"remove","lines":["> Conférence ce midi","> Conférence maintenant","> Conférence dans 5 min",""],"id":795,"ignore":true}],[{"start":{"row":49,"column":9},"end":{"row":49,"column":10},"action":"remove","lines":[" "],"id":796}],[{"start":{"row":49,"column":8},"end":{"row":49,"column":9},"action":"remove","lines":["-"],"id":797}],[{"start":{"row":49,"column":4},"end":{"row":49,"column":8},"action":"remove","lines":[" "],"id":798}],[{"start":{"row":49,"column":3},"end":{"row":49,"column":4},"action":"remove","lines":[" "],"id":799}],[{"start":{"row":49,"column":2},"end":{"row":49,"column":3},"action":"remove","lines":[" "],"id":800}],[{"start":{"row":49,"column":1},"end":{"row":49,"column":2},"action":"remove","lines":[" "],"id":801}],[{"start":{"row":49,"column":0},"end":{"row":49,"column":1},"action":"remove","lines":[">"],"id":802}],[{"start":{"row":48,"column":41},"end":{"row":49,"column":0},"action":"remove","lines":["",""],"id":803}],[{"start":{"row":62,"column":17},"end":{"row":62,"column":29},"action":"remove","lines":["les annonces"],"id":804,"ignore":true}],[{"start":{"row":62,"column":11},"end":{"row":62,"column":17},"action":"remove","lines":[" dans "],"id":805,"ignore":true}],[{"start":{"row":62,"column":2},"end":{"row":62,"column":11},"action":"remove","lines":["Recherche"],"id":806,"ignore":true}],[{"start":{"row":61,"column":38},"end":{"row":62,"column":2},"action":"remove","lines":["","> "],"id":807,"ignore":true}],[{"start":{"row":57,"column":0},"end":{"row":57,"column":1},"action":"insert","lines":["t"],"id":808,"ignore":true}],[{"start":{"row":63,"column":1},"end":{"row":63,"column":2},"action":"insert","lines":[" "],"id":809,"ignore":true}],[{"start":{"row":57,"column":0},"end":{"row":57,"column":1},"action":"remove","lines":["t"],"id":810,"ignore":true}],[{"start":{"row":57,"column":0},"end":{"row":57,"column":1},"action":"insert","lines":["<"],"id":811,"ignore":true}],[{"start":{"row":57,"column":0},"end":{"row":57,"column":1},"action":"remove","lines":["<"],"id":812,"ignore":true}],[{"start":{"row":57,"column":0},"end":{"row":57,"column":1},"action":"insert","lines":[">"],"id":813,"ignore":true}],[{"start":{"row":63,"column":2},"end":{"row":63,"column":3},"action":"insert","lines":["D"],"id":814,"ignore":true}],[{"start":{"row":63,"column":3},"end":{"row":63,"column":7},"action":"insert","lines":["eman"],"id":815,"ignore":true}],[{"start":{"row":63,"column":7},"end":{"row":63,"column":13},"action":"insert","lines":["de de "],"id":816,"ignore":true}],[{"start":{"row":63,"column":13},"end":{"row":63,"column":15},"action":"insert","lines":["ré"],"id":817,"ignore":true}],[{"start":{"row":63,"column":15},"end":{"row":63,"column":17},"action":"insert","lines":["se"],"id":818,"ignore":true}],[{"start":{"row":63,"column":17},"end":{"row":63,"column":21},"action":"insert","lines":["rvat"],"id":819,"ignore":true}],[{"start":{"row":63,"column":21},"end":{"row":63,"column":24},"action":"insert","lines":["ion"],"id":820,"ignore":true}],[{"start":{"row":63,"column":24},"end":{"row":64,"column":1},"action":"insert","lines":["",">"],"id":821,"ignore":true}],[{"start":{"row":64,"column":1},"end":{"row":64,"column":2},"action":"insert","lines":[" "],"id":822,"ignore":true}],[{"start":{"row":64,"column":2},"end":{"row":64,"column":3},"action":"insert","lines":["I"],"id":823,"ignore":true}],[{"start":{"row":64,"column":2},"end":{"row":64,"column":3},"action":"remove","lines":["I"],"id":824,"ignore":true},{"start":{"row":64,"column":2},"end":{"row":64,"column":3},"action":"insert","lines":["U"]}],[{"start":{"row":64,"column":3},"end":{"row":64,"column":4},"action":"insert","lines":["o"],"id":825,"ignore":true}],[{"start":{"row":64,"column":3},"end":{"row":64,"column":4},"action":"remove","lines":["o"],"id":826,"ignore":true},{"start":{"row":64,"column":3},"end":{"row":64,"column":4},"action":"insert","lines":["p"]}],[{"start":{"row":64,"column":4},"end":{"row":64,"column":7},"action":"insert","lines":["loa"],"id":827,"ignore":true}],[{"start":{"row":64,"column":7},"end":{"row":64,"column":10},"action":"insert","lines":["d d"],"id":828,"ignore":true}],[{"start":{"row":64,"column":10},"end":{"row":64,"column":13},"action":"insert","lines":["'im"],"id":829,"ignore":true}],[{"start":{"row":64,"column":13},"end":{"row":64,"column":16},"action":"insert","lines":["age"],"id":830,"ignore":true}]]},"ace":{"folds":[],"scrolltop":1048,"scrollleft":0,"selection":{"start":{"row":48,"column":41},"end":{"row":48,"column":41},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":64,"state":"blockquote","mode":"ace/mode/markdown"}},"timestamp":1511175591649}
\ No newline at end of file
+{"filter":false,"title":"iteration_2.md","tooltip":"/reports/iteration_2.md","undoManager":{"mark":1,"position":1,"stack":[[{"start":{"row":79,"column":44},"end":{"row":79,"column":45},"action":"remove","lines":["2"],"id":2}],[{"start":{"row":79,"column":44},"end":{"row":79,"column":45},"action":"insert","lines":["1"],"id":3}]]},"ace":{"folds":[],"scrolltop":0,"scrollleft":0,"selection":{"start":{"row":8,"column":44},"end":{"row":8,"column":44},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0},"timestamp":1513588153321,"hash":"92c092467ec4b7a733a4d78df749e0bd57dad79e"}
\ No newline at end of file
diff --git a/workspace/.c9/metadata/workspace/resources/views/products/product_show.blade.php b/workspace/.c9/metadata/workspace/resources/views/products/product_show.blade.php
index 779adfe742af40a548191dd0e653a1a6711af412..3321c84275029aed8be88cde29067544b5010650 100644
--- a/workspace/.c9/metadata/workspace/resources/views/products/product_show.blade.php
+++ b/workspace/.c9/metadata/workspace/resources/views/products/product_show.blade.php
@@ -1 +1 @@
-{"filter":false,"title":"product_show.blade.php","tooltip":"/resources/views/products/product_show.blade.php","undoManager":{"mark":12,"position":12,"stack":[[{"start":{"row":80,"column":5},"end":{"row":81,"column":0},"action":"insert","lines":["",""],"id":1328},{"start":{"row":81,"column":0},"end":{"row":81,"column":4},"action":"insert","lines":["\t\t\t\t"]}],[{"start":{"row":81,"column":4},"end":{"row":82,"column":0},"action":"insert","lines":["",""],"id":1329},{"start":{"row":82,"column":0},"end":{"row":82,"column":4},"action":"insert","lines":["\t\t\t\t"]}],[{"start":{"row":82,"column":4},"end":{"row":86,"column":5},"action":"insert","lines":["if(Auth::user()->id != $product->id_owner and ! $product->booked){ //réservation pour les autres que le proprio de l'annonce","\t\t\t\t\techo ( Form::open(['method' => 'GET', 'route' => ['reservations.store', $product->id, Auth::user()->id ]]) ); // TODO resa","\t\t\t\t\techo ( Form::submit('Réserver', ['class' => 'btn btn-warning mx-1', 'onclick' => 'return confirm(\\'Confirmez-vous votre réservation ?\\')']) );","\t\t\t\t\techo ( Form::close() );","\t\t\t\t}"],"id":1330}],[{"start":{"row":82,"column":51},"end":{"row":82,"column":52},"action":"remove","lines":[" "],"id":1331}],[{"start":{"row":82,"column":50},"end":{"row":82,"column":51},"action":"remove","lines":["!"],"id":1332}],[{"start":{"row":78,"column":66},"end":{"row":78,"column":67},"action":"insert","lines":[" "],"id":1333}],[{"start":{"row":78,"column":67},"end":{"row":78,"column":68},"action":"insert","lines":["a"],"id":1352}],[{"start":{"row":78,"column":68},"end":{"row":78,"column":69},"action":"insert","lines":["n"],"id":1353}],[{"start":{"row":78,"column":69},"end":{"row":78,"column":70},"action":"insert","lines":["d"],"id":1354}],[{"start":{"row":78,"column":70},"end":{"row":78,"column":71},"action":"insert","lines":[" "],"id":1355}],[{"start":{"row":78,"column":67},"end":{"row":78,"column":71},"action":"remove","lines":["and "],"id":1356}],[{"start":{"row":78,"column":66},"end":{"row":78,"column":67},"action":"remove","lines":[" "],"id":1357}],[{"start":{"row":80,"column":5},"end":{"row":86,"column":5},"action":"remove","lines":["","\t\t\t\t","\t\t\t\tif(Auth::user()->id != $product->id_owner and $product->booked){ //réservation pour les autres que le proprio de l'annonce","\t\t\t\t\techo ( Form::open(['method' => 'GET', 'route' => ['reservations.store', $product->id, Auth::user()->id ]]) ); // TODO resa","\t\t\t\t\techo ( Form::submit('Réserver', ['class' => 'btn btn-warning mx-1', 'onclick' => 'return confirm(\\'Confirmez-vous votre réservation ?\\')']) );","\t\t\t\t\techo ( Form::close() );","\t\t\t\t}"],"id":1358}]]},"ace":{"folds":[],"scrolltop":600,"scrollleft":0,"selection":{"start":{"row":61,"column":8},"end":{"row":61,"column":8},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":193,"mode":"ace/mode/php"}},"timestamp":1513549557238,"hash":"af056d9478dc35ac56acdfeff417056ce72b0d4b"}
\ No newline at end of file
+{"filter":false,"title":"product_show.blade.php","tooltip":"/resources/views/products/product_show.blade.php","undoManager":{"mark":12,"position":12,"stack":[[{"start":{"row":80,"column":5},"end":{"row":81,"column":0},"action":"insert","lines":["",""],"id":1328},{"start":{"row":81,"column":0},"end":{"row":81,"column":4},"action":"insert","lines":["\t\t\t\t"]}],[{"start":{"row":81,"column":4},"end":{"row":82,"column":0},"action":"insert","lines":["",""],"id":1329},{"start":{"row":82,"column":0},"end":{"row":82,"column":4},"action":"insert","lines":["\t\t\t\t"]}],[{"start":{"row":82,"column":4},"end":{"row":86,"column":5},"action":"insert","lines":["if(Auth::user()->id != $product->id_owner and ! $product->booked){ //réservation pour les autres que le proprio de l'annonce","\t\t\t\t\techo ( Form::open(['method' => 'GET', 'route' => ['reservations.store', $product->id, Auth::user()->id ]]) ); // TODO resa","\t\t\t\t\techo ( Form::submit('Réserver', ['class' => 'btn btn-warning mx-1', 'onclick' => 'return confirm(\\'Confirmez-vous votre réservation ?\\')']) );","\t\t\t\t\techo ( Form::close() );","\t\t\t\t}"],"id":1330}],[{"start":{"row":82,"column":51},"end":{"row":82,"column":52},"action":"remove","lines":[" "],"id":1331}],[{"start":{"row":82,"column":50},"end":{"row":82,"column":51},"action":"remove","lines":["!"],"id":1332}],[{"start":{"row":78,"column":66},"end":{"row":78,"column":67},"action":"insert","lines":[" "],"id":1333}],[{"start":{"row":78,"column":67},"end":{"row":78,"column":68},"action":"insert","lines":["a"],"id":1352}],[{"start":{"row":78,"column":68},"end":{"row":78,"column":69},"action":"insert","lines":["n"],"id":1353}],[{"start":{"row":78,"column":69},"end":{"row":78,"column":70},"action":"insert","lines":["d"],"id":1354}],[{"start":{"row":78,"column":70},"end":{"row":78,"column":71},"action":"insert","lines":[" "],"id":1355}],[{"start":{"row":78,"column":67},"end":{"row":78,"column":71},"action":"remove","lines":["and "],"id":1356}],[{"start":{"row":78,"column":66},"end":{"row":78,"column":67},"action":"remove","lines":[" "],"id":1357}],[{"start":{"row":80,"column":5},"end":{"row":86,"column":5},"action":"remove","lines":["","\t\t\t\t","\t\t\t\tif(Auth::user()->id != $product->id_owner and $product->booked){ //réservation pour les autres que le proprio de l'annonce","\t\t\t\t\techo ( Form::open(['method' => 'GET', 'route' => ['reservations.store', $product->id, Auth::user()->id ]]) ); // TODO resa","\t\t\t\t\techo ( Form::submit('Réserver', ['class' => 'btn btn-warning mx-1', 'onclick' => 'return confirm(\\'Confirmez-vous votre réservation ?\\')']) );","\t\t\t\t\techo ( Form::close() );","\t\t\t\t}"],"id":1358}]]},"ace":{"folds":[],"scrolltop":600,"scrollleft":0,"selection":{"start":{"row":61,"column":8},"end":{"row":61,"column":8},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":49,"state":"php-start","mode":"ace/mode/php"}},"timestamp":1513549557238,"hash":"af056d9478dc35ac56acdfeff417056ce72b0d4b"}
\ No newline at end of file
diff --git a/workspace/.c9/metadata/workspace/resources/views/user/user_show.blade.php b/workspace/.c9/metadata/workspace/resources/views/user/user_show.blade.php
index 0a6ccf1b1b3234cd589df057637a837d0ea4a422..7c6fcd4573960b1f97b504815cd0174a99f34f36 100644
--- a/workspace/.c9/metadata/workspace/resources/views/user/user_show.blade.php
+++ b/workspace/.c9/metadata/workspace/resources/views/user/user_show.blade.php
@@ -1 +1 @@
-{"filter":false,"title":"user_show.blade.php","tooltip":"/resources/views/user/user_show.blade.php","undoManager":{"mark":100,"position":100,"stack":[[{"start":{"row":180,"column":8},"end":{"row":181,"column":0},"action":"remove","lines":["",""],"id":434}],[{"start":{"row":185,"column":2},"end":{"row":185,"column":30},"action":"remove","lines":["<div class=\"col-lg-4\"></div>"],"id":435}],[{"start":{"row":185,"column":1},"end":{"row":185,"column":2},"action":"remove","lines":["\t"],"id":436}],[{"start":{"row":185,"column":0},"end":{"row":185,"column":1},"action":"remove","lines":["\t"],"id":437}],[{"start":{"row":184,"column":2},"end":{"row":185,"column":0},"action":"remove","lines":["",""],"id":438}],[{"start":{"row":186,"column":76},"end":{"row":187,"column":0},"action":"insert","lines":["",""],"id":439},{"start":{"row":187,"column":0},"end":{"row":187,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":187,"column":2},"end":{"row":188,"column":0},"action":"insert","lines":["",""],"id":440},{"start":{"row":188,"column":0},"end":{"row":188,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":188,"column":2},"end":{"row":190,"column":30},"action":"insert","lines":["<br/>","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":441}],[{"start":{"row":190,"column":30},"end":{"row":191,"column":0},"action":"insert","lines":["",""],"id":442},{"start":{"row":191,"column":0},"end":{"row":191,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":239,"column":8},"end":{"row":240,"column":0},"action":"insert","lines":["",""],"id":443},{"start":{"row":240,"column":0},"end":{"row":240,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":240,"column":2},"end":{"row":241,"column":0},"action":"insert","lines":["",""],"id":444},{"start":{"row":241,"column":0},"end":{"row":241,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":241,"column":2},"end":{"row":243,"column":30},"action":"insert","lines":["<br/>","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":445}],[{"start":{"row":240,"column":2},"end":{"row":243,"column":30},"action":"remove","lines":["","\t\t<br/>","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":446}],[{"start":{"row":240,"column":1},"end":{"row":240,"column":2},"action":"remove","lines":["\t"],"id":447}],[{"start":{"row":240,"column":0},"end":{"row":240,"column":1},"action":"remove","lines":["\t"],"id":448}],[{"start":{"row":239,"column":8},"end":{"row":240,"column":0},"action":"remove","lines":["",""],"id":449}],[{"start":{"row":242,"column":2},"end":{"row":242,"column":30},"action":"remove","lines":["<div class=\"col-lg-4\"></div>"],"id":450}],[{"start":{"row":242,"column":1},"end":{"row":242,"column":2},"action":"remove","lines":["\t"],"id":451}],[{"start":{"row":242,"column":0},"end":{"row":242,"column":1},"action":"remove","lines":["\t"],"id":452}],[{"start":{"row":241,"column":2},"end":{"row":242,"column":0},"action":"remove","lines":["",""],"id":453}],[{"start":{"row":241,"column":1},"end":{"row":241,"column":2},"action":"remove","lines":["\t"],"id":454}],[{"start":{"row":241,"column":0},"end":{"row":241,"column":1},"action":"remove","lines":["\t"],"id":455}],[{"start":{"row":240,"column":8},"end":{"row":241,"column":0},"action":"remove","lines":["",""],"id":456}],[{"start":{"row":239,"column":8},"end":{"row":240,"column":0},"action":"insert","lines":["",""],"id":457},{"start":{"row":240,"column":0},"end":{"row":240,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":240,"column":2},"end":{"row":241,"column":0},"action":"insert","lines":["",""],"id":458},{"start":{"row":241,"column":0},"end":{"row":241,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":241,"column":2},"end":{"row":243,"column":30},"action":"insert","lines":["<br/>","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":459}],[{"start":{"row":243,"column":30},"end":{"row":244,"column":0},"action":"insert","lines":["",""],"id":460},{"start":{"row":244,"column":0},"end":{"row":244,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":240,"column":2},"end":{"row":241,"column":7},"action":"remove","lines":["","\t\t<br/>"],"id":461}],[{"start":{"row":240,"column":1},"end":{"row":240,"column":2},"action":"remove","lines":["\t"],"id":462}],[{"start":{"row":240,"column":0},"end":{"row":240,"column":1},"action":"remove","lines":["\t"],"id":463}],[{"start":{"row":239,"column":8},"end":{"row":240,"column":0},"action":"remove","lines":["",""],"id":464}],[{"start":{"row":239,"column":8},"end":{"row":241,"column":30},"action":"remove","lines":["","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":465}],[{"start":{"row":240,"column":1},"end":{"row":240,"column":2},"action":"remove","lines":["\t"],"id":466}],[{"start":{"row":240,"column":0},"end":{"row":240,"column":1},"action":"remove","lines":["\t"],"id":467}],[{"start":{"row":239,"column":8},"end":{"row":240,"column":0},"action":"remove","lines":["",""],"id":468}],[{"start":{"row":240,"column":8},"end":{"row":241,"column":0},"action":"insert","lines":["",""],"id":469},{"start":{"row":241,"column":0},"end":{"row":241,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":241,"column":2},"end":{"row":243,"column":30},"action":"insert","lines":["<br/>","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":470}],[{"start":{"row":240,"column":8},"end":{"row":241,"column":0},"action":"insert","lines":["",""],"id":471},{"start":{"row":241,"column":0},"end":{"row":241,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":240,"column":8},"end":{"row":242,"column":7},"action":"remove","lines":["","\t\t","\t\t<br/>"],"id":472}],[{"start":{"row":65,"column":6},"end":{"row":65,"column":7},"action":"insert","lines":[" "],"id":473}],[{"start":{"row":65,"column":7},"end":{"row":65,"column":8},"action":"insert","lines":["c"],"id":474}],[{"start":{"row":65,"column":8},"end":{"row":65,"column":9},"action":"insert","lines":["o"],"id":475}],[{"start":{"row":65,"column":9},"end":{"row":65,"column":10},"action":"insert","lines":["l"],"id":476}],[{"start":{"row":65,"column":9},"end":{"row":65,"column":10},"action":"remove","lines":["l"],"id":477}],[{"start":{"row":65,"column":8},"end":{"row":65,"column":9},"action":"remove","lines":["o"],"id":478}],[{"start":{"row":65,"column":8},"end":{"row":65,"column":9},"action":"insert","lines":["l"],"id":479}],[{"start":{"row":65,"column":9},"end":{"row":65,"column":10},"action":"insert","lines":["a"],"id":480}],[{"start":{"row":65,"column":10},"end":{"row":65,"column":11},"action":"insert","lines":["s"],"id":481}],[{"start":{"row":65,"column":11},"end":{"row":65,"column":12},"action":"insert","lines":["s"],"id":482}],[{"start":{"row":65,"column":12},"end":{"row":65,"column":13},"action":"insert","lines":[" "],"id":483}],[{"start":{"row":65,"column":13},"end":{"row":65,"column":14},"action":"insert","lines":["="],"id":484}],[{"start":{"row":65,"column":14},"end":{"row":65,"column":15},"action":"insert","lines":[" "],"id":485}],[{"start":{"row":65,"column":14},"end":{"row":65,"column":15},"action":"remove","lines":[" "],"id":486}],[{"start":{"row":65,"column":13},"end":{"row":65,"column":14},"action":"remove","lines":["="],"id":487}],[{"start":{"row":65,"column":12},"end":{"row":65,"column":13},"action":"remove","lines":[" "],"id":488}],[{"start":{"row":65,"column":12},"end":{"row":65,"column":13},"action":"insert","lines":["="],"id":489}],[{"start":{"row":65,"column":13},"end":{"row":65,"column":15},"action":"insert","lines":["''"],"id":490}],[{"start":{"row":65,"column":13},"end":{"row":65,"column":15},"action":"remove","lines":["''"],"id":491}],[{"start":{"row":65,"column":13},"end":{"row":65,"column":15},"action":"insert","lines":["\"\""],"id":492}],[{"start":{"row":65,"column":14},"end":{"row":65,"column":15},"action":"insert","lines":["c"],"id":493}],[{"start":{"row":65,"column":15},"end":{"row":65,"column":16},"action":"insert","lines":["o"],"id":494}],[{"start":{"row":65,"column":16},"end":{"row":65,"column":17},"action":"insert","lines":["l"],"id":495}],[{"start":{"row":65,"column":17},"end":{"row":65,"column":18},"action":"insert","lines":["-"],"id":496}],[{"start":{"row":65,"column":18},"end":{"row":65,"column":19},"action":"insert","lines":["l"],"id":497}],[{"start":{"row":65,"column":19},"end":{"row":65,"column":20},"action":"insert","lines":["g"],"id":498}],[{"start":{"row":65,"column":20},"end":{"row":65,"column":21},"action":"insert","lines":["-"],"id":499}],[{"start":{"row":65,"column":21},"end":{"row":65,"column":22},"action":"insert","lines":["8"],"id":500}],[{"start":{"row":126,"column":2},"end":{"row":127,"column":30},"action":"remove","lines":["","\t\t<div class=\"col-lg-4\"></div>"],"id":502}],[{"start":{"row":126,"column":1},"end":{"row":126,"column":2},"action":"remove","lines":["\t"],"id":503}],[{"start":{"row":126,"column":0},"end":{"row":126,"column":1},"action":"remove","lines":["\t"],"id":504}],[{"start":{"row":125,"column":8},"end":{"row":126,"column":0},"action":"remove","lines":["",""],"id":505}],[{"start":{"row":133,"column":6},"end":{"row":133,"column":7},"action":"insert","lines":[" "],"id":506}],[{"start":{"row":133,"column":7},"end":{"row":133,"column":23},"action":"insert","lines":["class=\"col-lg-8\""],"id":507}],[{"start":{"row":190,"column":6},"end":{"row":190,"column":7},"action":"insert","lines":[" "],"id":508}],[{"start":{"row":190,"column":7},"end":{"row":190,"column":23},"action":"insert","lines":["class=\"col-lg-8\""],"id":509}],[{"start":{"row":237,"column":8},"end":{"row":238,"column":0},"action":"insert","lines":["",""],"id":510},{"start":{"row":238,"column":0},"end":{"row":238,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":238,"column":2},"end":{"row":239,"column":0},"action":"insert","lines":["",""],"id":511},{"start":{"row":239,"column":0},"end":{"row":239,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":239,"column":2},"end":{"row":239,"column":30},"action":"insert","lines":["<div class=\"col-lg-4\"></div>"],"id":512}],[{"start":{"row":179,"column":2},"end":{"row":180,"column":30},"action":"remove","lines":["","\t\t<div class=\"col-lg-4\"></div>"],"id":516}],[{"start":{"row":237,"column":2},"end":{"row":238,"column":30},"action":"remove","lines":["","\t\t<div class=\"col-lg-4\"></div>"],"id":517}],[{"start":{"row":239,"column":2},"end":{"row":240,"column":30},"action":"remove","lines":["","\t\t<div class=\"col-lg-4\"></div>"],"id":518}],[{"start":{"row":252,"column":2},"end":{"row":253,"column":0},"action":"insert","lines":["",""],"id":519},{"start":{"row":253,"column":0},"end":{"row":253,"column":1},"action":"insert","lines":["\t"]}],[{"start":{"row":253,"column":1},"end":{"row":253,"column":2},"action":"insert","lines":["."],"id":520}],[{"start":{"row":253,"column":2},"end":{"row":253,"column":3},"action":"insert","lines":["h"],"id":521}],[{"start":{"row":253,"column":3},"end":{"row":253,"column":4},"action":"insert","lines":["2"],"id":522}],[{"start":{"row":253,"column":4},"end":{"row":253,"column":5},"action":"insert","lines":["."],"id":523}],[{"start":{"row":253,"column":5},"end":{"row":253,"column":6},"action":"insert","lines":["m"],"id":524}],[{"start":{"row":253,"column":6},"end":{"row":253,"column":7},"action":"insert","lines":["y"],"id":525}],[{"start":{"row":253,"column":7},"end":{"row":253,"column":8},"action":"insert","lines":["-"],"id":526}],[{"start":{"row":253,"column":8},"end":{"row":253,"column":9},"action":"insert","lines":["4"],"id":527}],[{"start":{"row":253,"column":9},"end":{"row":253,"column":10},"action":"insert","lines":["{"],"id":528}],[{"start":{"row":253,"column":10},"end":{"row":255,"column":2},"action":"insert","lines":["","\t\t","\t}"],"id":529}],[{"start":{"row":254,"column":2},"end":{"row":254,"column":29},"action":"insert","lines":["text-decoration: underline;"],"id":530}],[{"start":{"row":253,"column":4},"end":{"row":253,"column":9},"action":"remove","lines":[".my-4"],"id":531}],[{"start":{"row":253,"column":4},"end":{"row":253,"column":5},"action":"insert","lines":[" "],"id":532}],[{"start":{"row":253,"column":1},"end":{"row":253,"column":2},"action":"remove","lines":["."],"id":533}],[{"start":{"row":253,"column":3},"end":{"row":253,"column":4},"action":"insert","lines":["."],"id":534}],[{"start":{"row":253,"column":4},"end":{"row":253,"column":5},"action":"insert","lines":["m"],"id":535}],[{"start":{"row":253,"column":5},"end":{"row":253,"column":6},"action":"insert","lines":["y"],"id":536}],[{"start":{"row":253,"column":6},"end":{"row":253,"column":7},"action":"insert","lines":["-"],"id":537}],[{"start":{"row":253,"column":7},"end":{"row":253,"column":8},"action":"insert","lines":["4"],"id":538}]]},"ace":{"folds":[],"scrolltop":2770,"scrollleft":0,"selection":{"start":{"row":253,"column":8},"end":{"row":253,"column":8},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":229,"state":"php-start","mode":"ace/mode/php"}},"timestamp":1513554489922,"hash":"f0fe5a0f8511e7ee985edca141322a795bef6bc4"}
\ No newline at end of file
+{"filter":false,"title":"user_show.blade.php","tooltip":"/resources/views/user/user_show.blade.php","undoManager":{"mark":100,"position":100,"stack":[[{"start":{"row":180,"column":8},"end":{"row":181,"column":0},"action":"remove","lines":["",""],"id":821}],[{"start":{"row":185,"column":2},"end":{"row":185,"column":30},"action":"remove","lines":["<div class=\"col-lg-4\"></div>"],"id":822}],[{"start":{"row":185,"column":1},"end":{"row":185,"column":2},"action":"remove","lines":["\t"],"id":823}],[{"start":{"row":185,"column":0},"end":{"row":185,"column":1},"action":"remove","lines":["\t"],"id":824}],[{"start":{"row":184,"column":2},"end":{"row":185,"column":0},"action":"remove","lines":["",""],"id":825}],[{"start":{"row":186,"column":76},"end":{"row":187,"column":0},"action":"insert","lines":["",""],"id":826},{"start":{"row":187,"column":0},"end":{"row":187,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":187,"column":2},"end":{"row":188,"column":0},"action":"insert","lines":["",""],"id":827},{"start":{"row":188,"column":0},"end":{"row":188,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":188,"column":2},"end":{"row":190,"column":30},"action":"insert","lines":["<br/>","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":828}],[{"start":{"row":190,"column":30},"end":{"row":191,"column":0},"action":"insert","lines":["",""],"id":829},{"start":{"row":191,"column":0},"end":{"row":191,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":239,"column":8},"end":{"row":240,"column":0},"action":"insert","lines":["",""],"id":830},{"start":{"row":240,"column":0},"end":{"row":240,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":240,"column":2},"end":{"row":241,"column":0},"action":"insert","lines":["",""],"id":831},{"start":{"row":241,"column":0},"end":{"row":241,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":241,"column":2},"end":{"row":243,"column":30},"action":"insert","lines":["<br/>","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":832}],[{"start":{"row":240,"column":2},"end":{"row":243,"column":30},"action":"remove","lines":["","\t\t<br/>","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":833}],[{"start":{"row":240,"column":1},"end":{"row":240,"column":2},"action":"remove","lines":["\t"],"id":834}],[{"start":{"row":240,"column":0},"end":{"row":240,"column":1},"action":"remove","lines":["\t"],"id":835}],[{"start":{"row":239,"column":8},"end":{"row":240,"column":0},"action":"remove","lines":["",""],"id":836}],[{"start":{"row":242,"column":2},"end":{"row":242,"column":30},"action":"remove","lines":["<div class=\"col-lg-4\"></div>"],"id":837}],[{"start":{"row":242,"column":1},"end":{"row":242,"column":2},"action":"remove","lines":["\t"],"id":838}],[{"start":{"row":242,"column":0},"end":{"row":242,"column":1},"action":"remove","lines":["\t"],"id":839}],[{"start":{"row":241,"column":2},"end":{"row":242,"column":0},"action":"remove","lines":["",""],"id":840}],[{"start":{"row":241,"column":1},"end":{"row":241,"column":2},"action":"remove","lines":["\t"],"id":841}],[{"start":{"row":241,"column":0},"end":{"row":241,"column":1},"action":"remove","lines":["\t"],"id":842}],[{"start":{"row":240,"column":8},"end":{"row":241,"column":0},"action":"remove","lines":["",""],"id":843}],[{"start":{"row":239,"column":8},"end":{"row":240,"column":0},"action":"insert","lines":["",""],"id":844},{"start":{"row":240,"column":0},"end":{"row":240,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":240,"column":2},"end":{"row":241,"column":0},"action":"insert","lines":["",""],"id":845},{"start":{"row":241,"column":0},"end":{"row":241,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":241,"column":2},"end":{"row":243,"column":30},"action":"insert","lines":["<br/>","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":846}],[{"start":{"row":243,"column":30},"end":{"row":244,"column":0},"action":"insert","lines":["",""],"id":847},{"start":{"row":244,"column":0},"end":{"row":244,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":240,"column":2},"end":{"row":241,"column":7},"action":"remove","lines":["","\t\t<br/>"],"id":848}],[{"start":{"row":240,"column":1},"end":{"row":240,"column":2},"action":"remove","lines":["\t"],"id":849}],[{"start":{"row":240,"column":0},"end":{"row":240,"column":1},"action":"remove","lines":["\t"],"id":850}],[{"start":{"row":239,"column":8},"end":{"row":240,"column":0},"action":"remove","lines":["",""],"id":851}],[{"start":{"row":239,"column":8},"end":{"row":241,"column":30},"action":"remove","lines":["","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":852}],[{"start":{"row":240,"column":1},"end":{"row":240,"column":2},"action":"remove","lines":["\t"],"id":853}],[{"start":{"row":240,"column":0},"end":{"row":240,"column":1},"action":"remove","lines":["\t"],"id":854}],[{"start":{"row":239,"column":8},"end":{"row":240,"column":0},"action":"remove","lines":["",""],"id":855}],[{"start":{"row":240,"column":8},"end":{"row":241,"column":0},"action":"insert","lines":["",""],"id":856},{"start":{"row":241,"column":0},"end":{"row":241,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":241,"column":2},"end":{"row":243,"column":30},"action":"insert","lines":["<br/>","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":857}],[{"start":{"row":240,"column":8},"end":{"row":241,"column":0},"action":"insert","lines":["",""],"id":858},{"start":{"row":241,"column":0},"end":{"row":241,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":240,"column":8},"end":{"row":242,"column":7},"action":"remove","lines":["","\t\t","\t\t<br/>"],"id":859}],[{"start":{"row":65,"column":6},"end":{"row":65,"column":7},"action":"insert","lines":[" "],"id":860}],[{"start":{"row":65,"column":7},"end":{"row":65,"column":8},"action":"insert","lines":["c"],"id":861}],[{"start":{"row":65,"column":8},"end":{"row":65,"column":9},"action":"insert","lines":["o"],"id":862}],[{"start":{"row":65,"column":9},"end":{"row":65,"column":10},"action":"insert","lines":["l"],"id":863}],[{"start":{"row":65,"column":9},"end":{"row":65,"column":10},"action":"remove","lines":["l"],"id":864}],[{"start":{"row":65,"column":8},"end":{"row":65,"column":9},"action":"remove","lines":["o"],"id":865}],[{"start":{"row":65,"column":8},"end":{"row":65,"column":9},"action":"insert","lines":["l"],"id":866}],[{"start":{"row":65,"column":9},"end":{"row":65,"column":10},"action":"insert","lines":["a"],"id":867}],[{"start":{"row":65,"column":10},"end":{"row":65,"column":11},"action":"insert","lines":["s"],"id":868}],[{"start":{"row":65,"column":11},"end":{"row":65,"column":12},"action":"insert","lines":["s"],"id":869}],[{"start":{"row":65,"column":12},"end":{"row":65,"column":13},"action":"insert","lines":[" "],"id":870}],[{"start":{"row":65,"column":13},"end":{"row":65,"column":14},"action":"insert","lines":["="],"id":871}],[{"start":{"row":65,"column":14},"end":{"row":65,"column":15},"action":"insert","lines":[" "],"id":872}],[{"start":{"row":65,"column":14},"end":{"row":65,"column":15},"action":"remove","lines":[" "],"id":873}],[{"start":{"row":65,"column":13},"end":{"row":65,"column":14},"action":"remove","lines":["="],"id":874}],[{"start":{"row":65,"column":12},"end":{"row":65,"column":13},"action":"remove","lines":[" "],"id":875}],[{"start":{"row":65,"column":12},"end":{"row":65,"column":13},"action":"insert","lines":["="],"id":876}],[{"start":{"row":65,"column":13},"end":{"row":65,"column":15},"action":"insert","lines":["''"],"id":877}],[{"start":{"row":65,"column":13},"end":{"row":65,"column":15},"action":"remove","lines":["''"],"id":878}],[{"start":{"row":65,"column":13},"end":{"row":65,"column":15},"action":"insert","lines":["\"\""],"id":879}],[{"start":{"row":65,"column":14},"end":{"row":65,"column":15},"action":"insert","lines":["c"],"id":880}],[{"start":{"row":65,"column":15},"end":{"row":65,"column":16},"action":"insert","lines":["o"],"id":881}],[{"start":{"row":65,"column":16},"end":{"row":65,"column":17},"action":"insert","lines":["l"],"id":882}],[{"start":{"row":65,"column":17},"end":{"row":65,"column":18},"action":"insert","lines":["-"],"id":883}],[{"start":{"row":65,"column":18},"end":{"row":65,"column":19},"action":"insert","lines":["l"],"id":884}],[{"start":{"row":65,"column":19},"end":{"row":65,"column":20},"action":"insert","lines":["g"],"id":885}],[{"start":{"row":65,"column":20},"end":{"row":65,"column":21},"action":"insert","lines":["-"],"id":886}],[{"start":{"row":65,"column":21},"end":{"row":65,"column":22},"action":"insert","lines":["8"],"id":887}],[{"start":{"row":126,"column":2},"end":{"row":127,"column":30},"action":"remove","lines":["","\t\t<div class=\"col-lg-4\"></div>"],"id":888}],[{"start":{"row":126,"column":1},"end":{"row":126,"column":2},"action":"remove","lines":["\t"],"id":889}],[{"start":{"row":126,"column":0},"end":{"row":126,"column":1},"action":"remove","lines":["\t"],"id":890}],[{"start":{"row":125,"column":8},"end":{"row":126,"column":0},"action":"remove","lines":["",""],"id":891}],[{"start":{"row":133,"column":6},"end":{"row":133,"column":7},"action":"insert","lines":[" "],"id":892}],[{"start":{"row":133,"column":7},"end":{"row":133,"column":23},"action":"insert","lines":["class=\"col-lg-8\""],"id":893}],[{"start":{"row":190,"column":6},"end":{"row":190,"column":7},"action":"insert","lines":[" "],"id":894}],[{"start":{"row":190,"column":7},"end":{"row":190,"column":23},"action":"insert","lines":["class=\"col-lg-8\""],"id":895}],[{"start":{"row":237,"column":8},"end":{"row":238,"column":0},"action":"insert","lines":["",""],"id":896},{"start":{"row":238,"column":0},"end":{"row":238,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":238,"column":2},"end":{"row":239,"column":0},"action":"insert","lines":["",""],"id":897},{"start":{"row":239,"column":0},"end":{"row":239,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":239,"column":2},"end":{"row":239,"column":30},"action":"insert","lines":["<div class=\"col-lg-4\"></div>"],"id":898}],[{"start":{"row":179,"column":2},"end":{"row":180,"column":30},"action":"remove","lines":["","\t\t<div class=\"col-lg-4\"></div>"],"id":899}],[{"start":{"row":237,"column":2},"end":{"row":238,"column":30},"action":"remove","lines":["","\t\t<div class=\"col-lg-4\"></div>"],"id":900}],[{"start":{"row":239,"column":2},"end":{"row":240,"column":30},"action":"remove","lines":["","\t\t<div class=\"col-lg-4\"></div>"],"id":901}],[{"start":{"row":252,"column":2},"end":{"row":253,"column":0},"action":"insert","lines":["",""],"id":902},{"start":{"row":253,"column":0},"end":{"row":253,"column":1},"action":"insert","lines":["\t"]}],[{"start":{"row":253,"column":1},"end":{"row":253,"column":2},"action":"insert","lines":["."],"id":903}],[{"start":{"row":253,"column":2},"end":{"row":253,"column":3},"action":"insert","lines":["h"],"id":904}],[{"start":{"row":253,"column":3},"end":{"row":253,"column":4},"action":"insert","lines":["2"],"id":905}],[{"start":{"row":253,"column":4},"end":{"row":253,"column":5},"action":"insert","lines":["."],"id":906}],[{"start":{"row":253,"column":5},"end":{"row":253,"column":6},"action":"insert","lines":["m"],"id":907}],[{"start":{"row":253,"column":6},"end":{"row":253,"column":7},"action":"insert","lines":["y"],"id":908}],[{"start":{"row":253,"column":7},"end":{"row":253,"column":8},"action":"insert","lines":["-"],"id":909}],[{"start":{"row":253,"column":8},"end":{"row":253,"column":9},"action":"insert","lines":["4"],"id":910}],[{"start":{"row":253,"column":9},"end":{"row":253,"column":10},"action":"insert","lines":["{"],"id":911}],[{"start":{"row":253,"column":10},"end":{"row":255,"column":2},"action":"insert","lines":["","\t\t","\t}"],"id":912}],[{"start":{"row":254,"column":2},"end":{"row":254,"column":29},"action":"insert","lines":["text-decoration: underline;"],"id":913}],[{"start":{"row":253,"column":4},"end":{"row":253,"column":9},"action":"remove","lines":[".my-4"],"id":914}],[{"start":{"row":253,"column":4},"end":{"row":253,"column":5},"action":"insert","lines":[" "],"id":915}],[{"start":{"row":253,"column":1},"end":{"row":253,"column":2},"action":"remove","lines":["."],"id":916}],[{"start":{"row":253,"column":3},"end":{"row":253,"column":4},"action":"insert","lines":["."],"id":917}],[{"start":{"row":253,"column":4},"end":{"row":253,"column":5},"action":"insert","lines":["m"],"id":918}],[{"start":{"row":253,"column":5},"end":{"row":253,"column":6},"action":"insert","lines":["y"],"id":919}],[{"start":{"row":253,"column":6},"end":{"row":253,"column":7},"action":"insert","lines":["-"],"id":920}],[{"start":{"row":253,"column":7},"end":{"row":253,"column":8},"action":"insert","lines":["4"],"id":921}]]},"ace":{"folds":[],"scrolltop":2770,"scrollleft":0,"selection":{"start":{"row":253,"column":8},"end":{"row":253,"column":8},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0},"timestamp":1513554489922,"hash":"1c25fb2644fdd3c4df945dd13aae4ea5647ef140"}
\ No newline at end of file
diff --git a/workspace/Retro.4.md b/workspace/Retro.4.md
new file mode 100644
index 0000000000000000000000000000000000000000..3f3fea49b5996e34b53fbd1c08900649a3fb7311
--- /dev/null
+++ b/workspace/Retro.4.md
@@ -0,0 +1,19 @@
+#Retro 4
+
+#likes
+Sok : Réservation, recherche avancé
+LDG : C'est bien (tout marche et c'est bien)
+Gonzo : produit fonctionnel
+Magis : Ouai
+Parp1 : Plus de participation de tout le monde, toutes les US faites
+Cartman : Le produit commence à avoir de la gueule
+
+#dislike
+Parp1 : Pas assez bosser la première semaine
+Sok :
+Gonzo : Pas beaucoup de travail sur la PIMA à cause des projets
+LDG : Beaucoup d'autre projet qui ont pris du temps
+Magis : Pareil, pas beaucoup de temps sur la PIMA
+Parp1 : Mauvaise gestion du temps , pas assez de travail la première semaine
+Cartman : On se marchait sur les pieds à un moment ralentit le dev parfois.
+
diff --git a/workspace/app/Http/Controllers/UserController.php b/workspace/app/Http/Controllers/UserController.php
index c4a7c94409a82a21169744d3e24ea9e8557dd9c0..f61701e07fef82456adcf931e62805f1070e8b1d 100644
--- a/workspace/app/Http/Controllers/UserController.php
+++ b/workspace/app/Http/Controllers/UserController.php
@@ -9,6 +9,7 @@ use App\Repositories\UserRepository;
use App\Repositories\ReservationRepository;
use Illuminate\Http\Request;
+use Carbon\Carbon;
/*Pour les jointures sur DB*/
use Illuminate\Support\Facades\DB;
@@ -60,6 +61,7 @@ class UserController extends Controller
->join('users', 'products.id_owner', '=', 'users.id')
->select('reservations.id_sender', 'users.id as id_user', 'users.name', 'users.email', 'products.id AS id_product', 'products.description', 'products.expire_at', 'products.title', 'products.category', 'products.id_owner', 'reservations.id as id_resa') //Mettre ici toutes les infos souhaité dans reservations
->where('reservations.id_sender', $user->id)
+ ->whereDate('products.expire_at', '>=', Carbon::today()->toDateString())
->paginate($this->ReservationPerPage);
/*Reservation sur mes annonces*/
@@ -68,6 +70,7 @@ class UserController extends Controller
->join('products', 'reservations.id_product', '=', 'products.id')
->select('users.id as id_user', 'users.name', 'users.email', 'products.id AS id_product', 'products.description', 'products.expire_at', 'products.title', 'products.category', 'products.id_owner') //Mettre ici toutes les infos souhaité dans reservations
->where('products.id_owner', $user->id)
+ ->whereDate('products.expire_at', '>=', Carbon::today()->toDateString())
->paginate($this->ReservationPerPage);
return view('user.user_show', compact('user','products','reservations','Myreservations','links'));
diff --git a/workspace/app/Repositories/ProductRepository.php b/workspace/app/Repositories/ProductRepository.php
index 872ea5b6586532356fad95941e45036d141da4ba..c6b6fd1f7208f6d8ea3ae234aaa22e5781cd166c 100644
--- a/workspace/app/Repositories/ProductRepository.php
+++ b/workspace/app/Repositories/ProductRepository.php
@@ -48,7 +48,9 @@ class ProductRepository
public function getPaginate($n)
{
- return $this->product->orderBy('expire_at', 'asc')->paginate($n);
+ return $this->product
+ ->whereDate('expire_at', '>=', Carbon::today()->toDateString())
+ ->orderBy('expire_at', 'asc')->paginate($n);
}
public function store(Array $inputs)
diff --git a/workspace/reports/iteration_2.md b/workspace/reports/iteration_2.md
index a23b58a0fdd878a71d4993c4e2c5146d63eaf903..e9b346d0f20e30c0027cc455b075f3798fa20607 100644
--- a/workspace/reports/iteration_2.md
+++ b/workspace/reports/iteration_2.md
@@ -77,7 +77,7 @@
| | :( | :| | :) | :D |
|:--------: |:----: |:----: |:----: |:----: |
-| Equipe 7 | *0* | *1* | *4* | *2* |
+| Equipe 7 | *0* | *1* | *4* | *1* |
diff --git a/workspace/reports/iteration_3.md b/workspace/reports/iteration_3.md
new file mode 100644
index 0000000000000000000000000000000000000000..e9b346d0f20e30c0027cc455b075f3798fa20607
--- /dev/null
+++ b/workspace/reports/iteration_3.md
@@ -0,0 +1,83 @@
+# Rapport d'itération
+
+## Composition de l'équipe
+
+
+| | Itération précédente |
+| ------------- |------------- |
+| **Product Owner** | *AICHHORN Guillaume* |
+| **Scrum Master** | *ALVES Alexandre* |
+| **Dev** | *KIM Hyoseok* |
+| **Dev** | *ALIMEHNNI Hugues* |
+| **Dev** | *SANN Sokchivin* |
+| **Dev** | *BENCHETRIT Milan* |
+| **Dev** | *MELCHIOR Louis* |
+
+## Bilan de l'itération précédente
+### Évènements
+*Quels sont les évènements qui ont marqué l'itération précédente? Répertoriez ici les évènements qui ont eu un impact sur ce qui était prévu à l'itération précédente.*
+> Guillaume n'était pas très disponible du fait de sa participation aux élections du BDE
+> L'équipe manquait d'organisation et a donc eu du mal à se mettre au travail (tâches définies mais mal réparties)
+
+### Taux de complétion de l'itération
+*Quel est le nombre d'éléments terminés par rapport au nombre total d'éléments prévu pour l'itération?*
+> 4 terminées / 7 prévues = 57%
+
+### Liste des User Stories terminées
+> Dépot d'annonce
+> Affichage des annonces (ensemble et individuel)
+
+## Rétrospective de l'itération précédente
+
+### Bilans des retours et des précédentes actions
+> Manque d'organisations et de communication : les membres de l'équipe ne savait pas quoi faire
+> Pas assez de stand up et état d'avancé du projet
+> Les USs étaient trop vagues et n'avaient pas été étudiées
+> Mauvaise compréhension des membres de l'équipe.
+> Difficultés à prendre en mains Laravel (nouvel environnement de travail)
+
+### Actions prises pour la prochaine itération
+> Meilleure communication (plus de réunion)
+> Meilleure plannification des tâches (répartition et objectifs)
+> US de plus petite taille.
+> Meilleur découpage des US.
+> Nouvel axe de travail (recentré sur le MVP)
+
+### Axes d'améliorations
+> PO : Doit être plus investi dans les prises de décisions concernant l'orientation du projet
+> - Conception/modification d'US.
+> - Définir la valeur de chaque US.
+> SM : Doit être un élement clé pour la cohésion et la communication au sein de l'équipe
+> - Moins animer les réunion mais doit maintenir l'égalité entre membres
+> Dev : Doivent être plus présents dans la réalisation du projet, n'hésitant pas à faire part de leurs problèmes
+
+## Prévisions de l'itération suivante
+### Évènements prévus
+> Conférence vendredi après-midi (24/11)
+> Conférence mardi matin (28/11)
+>
+### Titre des User Stories reportées
+> Fin du MVP (update, suppression d'annonce, recherche simple)
+
+### Titre des nouvelles User Stories
+> Les US reportées
+> Demande de réservation
+> Upload d'image
+
+## Confiance
+### Taux de confiance de l'équipe dans l'itération
+*Remplir le tableau sachant que :D est une confiance totale dans le fait de livrer les éléments de l'itération. Mettre le nombre de votes dans chacune des cases. Expliquer en cas de besoin.*
+
+| | :( | :| | :) | :D |
+|:--------: |:----: |:----: |:----: |:----: |
+| Equipe 7 | *0* | *3* | *4* | *0* |
+
+### Taux de confiance de l'équipe pour la réalisation du projet
+*Remplir le tableau sachant que :D est une confiance totale dans le fait de réaliser le projet. Mettre le nombre de votes dans chacune des cases. Expliquer en cas de besoin.*
+
+| | :( | :| | :) | :D |
+|:--------: |:----: |:----: |:----: |:----: |
+| Equipe 7 | *0* | *1* | *4* | *1* |
+
+
+
diff --git a/workspace/reports/iteration_4.md b/workspace/reports/iteration_4.md
new file mode 100644
index 0000000000000000000000000000000000000000..a23b58a0fdd878a71d4993c4e2c5146d63eaf903
--- /dev/null
+++ b/workspace/reports/iteration_4.md
@@ -0,0 +1,83 @@
+# Rapport d'itération
+
+## Composition de l'équipe
+
+
+| | Itération précédente |
+| ------------- |------------- |
+| **Product Owner** | *AICHHORN Guillaume* |
+| **Scrum Master** | *ALVES Alexandre* |
+| **Dev** | *KIM Hyoseok* |
+| **Dev** | *ALIMEHNNI Hugues* |
+| **Dev** | *SANN Sokchivin* |
+| **Dev** | *BENCHETRIT Milan* |
+| **Dev** | *MELCHIOR Louis* |
+
+## Bilan de l'itération précédente
+### Évènements
+*Quels sont les évènements qui ont marqué l'itération précédente? Répertoriez ici les évènements qui ont eu un impact sur ce qui était prévu à l'itération précédente.*
+> Guillaume n'était pas très disponible du fait de sa participation aux élections du BDE
+> L'équipe manquait d'organisation et a donc eu du mal à se mettre au travail (tâches définies mais mal réparties)
+
+### Taux de complétion de l'itération
+*Quel est le nombre d'éléments terminés par rapport au nombre total d'éléments prévu pour l'itération?*
+> 4 terminées / 7 prévues = 57%
+
+### Liste des User Stories terminées
+> Dépot d'annonce
+> Affichage des annonces (ensemble et individuel)
+
+## Rétrospective de l'itération précédente
+
+### Bilans des retours et des précédentes actions
+> Manque d'organisations et de communication : les membres de l'équipe ne savait pas quoi faire
+> Pas assez de stand up et état d'avancé du projet
+> Les USs étaient trop vagues et n'avaient pas été étudiées
+> Mauvaise compréhension des membres de l'équipe.
+> Difficultés à prendre en mains Laravel (nouvel environnement de travail)
+
+### Actions prises pour la prochaine itération
+> Meilleure communication (plus de réunion)
+> Meilleure plannification des tâches (répartition et objectifs)
+> US de plus petite taille.
+> Meilleur découpage des US.
+> Nouvel axe de travail (recentré sur le MVP)
+
+### Axes d'améliorations
+> PO : Doit être plus investi dans les prises de décisions concernant l'orientation du projet
+> - Conception/modification d'US.
+> - Définir la valeur de chaque US.
+> SM : Doit être un élement clé pour la cohésion et la communication au sein de l'équipe
+> - Moins animer les réunion mais doit maintenir l'égalité entre membres
+> Dev : Doivent être plus présents dans la réalisation du projet, n'hésitant pas à faire part de leurs problèmes
+
+## Prévisions de l'itération suivante
+### Évènements prévus
+> Conférence vendredi après-midi (24/11)
+> Conférence mardi matin (28/11)
+>
+### Titre des User Stories reportées
+> Fin du MVP (update, suppression d'annonce, recherche simple)
+
+### Titre des nouvelles User Stories
+> Les US reportées
+> Demande de réservation
+> Upload d'image
+
+## Confiance
+### Taux de confiance de l'équipe dans l'itération
+*Remplir le tableau sachant que :D est une confiance totale dans le fait de livrer les éléments de l'itération. Mettre le nombre de votes dans chacune des cases. Expliquer en cas de besoin.*
+
+| | :( | :| | :) | :D |
+|:--------: |:----: |:----: |:----: |:----: |
+| Equipe 7 | *0* | *3* | *4* | *0* |
+
+### Taux de confiance de l'équipe pour la réalisation du projet
+*Remplir le tableau sachant que :D est une confiance totale dans le fait de réaliser le projet. Mettre le nombre de votes dans chacune des cases. Expliquer en cas de besoin.*
+
+| | :( | :| | :) | :D |
+|:--------: |:----: |:----: |:----: |:----: |
+| Equipe 7 | *0* | *1* | *4* | *2* |
+
+
+