From 6f532eaf05a2767d077f75aaf348c80be61f585d Mon Sep 17 00:00:00 2001
From: nat <nat@delcita.nathaliehc.uy>
Date: Thu, 24 Feb 2022 19:07:58 -0300
Subject: [PATCH] ver dinero total del pedido en la barra de navegacion (total
 de chismosa)

---
 app/Http/Resources/SubpedidoResource.php    |   8 ++---
 public/assets/chismosa.png                  | Bin 0 -> 2497 bytes
 public/js/app.js                            |  33 ++++++++++++++++----
 public/js/subpedidos-create.js              |  10 ++++--
 resources/views/subpedidos_create.blade.php |   2 +-
 routes/web.php                              |  10 ++++++
 6 files changed, 49 insertions(+), 14 deletions(-)
 create mode 100644 public/assets/chismosa.png

diff --git a/app/Http/Resources/SubpedidoResource.php b/app/Http/Resources/SubpedidoResource.php
index e6361ba..f659379 100644
--- a/app/Http/Resources/SubpedidoResource.php
+++ b/app/Http/Resources/SubpedidoResource.php
@@ -17,11 +17,11 @@ class SubpedidoResource extends JsonResource
         return [
             'id' => $this->id,
             'nombre' => $this->nombre,
-            'subtotal_productos' => $this->getSubtotalProductos(),
-            'subtotal_bonos' => $this->getSubtotalBonos(),
+            'subtotal_productos' => number_format($this->getSubtotalProductos(),2),
+            'subtotal_bonos' => number_format($this->getSubtotalBonos(),2),
             'bonos_de_transporte' => $this->cantidadBDT(),
-            'subtotal_bonos_de_transporte' => $this->getSubtotalBDT(),
-            'total' => $this->getTotal(),
+            'subtotal_bonos_de_transporte' => number_format($this->getSubtotalBDT(),2),
+            'total' => number_format($this->getTotal(),2),
             'grupo_de_compra' => $this->grupoDeCompra
         ];
     }
diff --git a/public/assets/chismosa.png b/public/assets/chismosa.png
new file mode 100644
index 0000000000000000000000000000000000000000..daf7c26aec74bda8405de57eea7525c9c408fdaf
GIT binary patch
literal 2497
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

literal 0
HcmV?d00001

diff --git a/public/js/app.js b/public/js/app.js
index 017f800..07d0845 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -8,6 +8,10 @@ Vue.component('nav-bar', {
               <img src="/assets/logoMPS.png" height="28">
             </a>
             <p style="margin:0 auto" class="navbar-item"><slot name="subpedido"></slot></p>
+            <a class="navbar-item" href="#">
+              <img style="padding:0 0.3em;" src="/assets/chismosa.png" height="28">
+              <p style="margin:0 auto; color:white">$ <span v-text="subpedido == null ? 0 : subpedido.total"></span></p>
+            </a>
             <a role="button" class="navbar-burger" :class="{'is-active':isActive}" aria-label="menu" aria-expanded="false" data-target="navbarBasicExample" @click="toggleState">
               <span aria-hidden="true"></span>
               <span aria-hidden="true"></span>
@@ -30,14 +34,31 @@ Vue.component('nav-bar', {
         </nav>`,
 	data() {
 		return {
-			isActive: false
+			isActive: false,
+      totalChismosa: 0,
+      subpedido: null
 		}
 	},
-  	methods: {
-  		toggleState() {
-  			this.isActive = !this.isActive;
-  		}
-  	}
+	methods: {
+		toggleState() {
+			this.isActive = !this.isActive;
+		},
+    actualizarSubpedido(){
+      axios.get("/api/subpedidos/" + this.subpedido.id)
+        .then(response => {
+          this.subpedido = response.data.data;
+      });
+    }
+	}, mounted() {
+    axios.get("/subpedidos/obtener_sesion").then(response => {
+      this.subpedido = response.data.subpedido;
+      this.actualizarSubpedido()
+    });
+    //Emitir un evento subpedido-actualizado al agregar o eliminar un producto del subpedido para que el total de la chismosa se muestre correctamente
+    Event.$on('subpedido-actualizado', () => {
+      this.actualizarSubpedido();
+    });
+  }
 });
 
 Vue.component('nav-migas', {
diff --git a/public/js/subpedidos-create.js b/public/js/subpedidos-create.js
index 052d4a8..e977aaf 100644
--- a/public/js/subpedidos-create.js
+++ b/public/js/subpedidos-create.js
@@ -16,7 +16,7 @@ Vue.component('subpedido-select', {
 	props: ["gdcid"],
 	mounted() {
 		console.log("ready");
-  	},
+	},
 	methods: {
   		onType() {
         if (!this.subpedido){
@@ -37,10 +37,14 @@ Vue.component('subpedido-select', {
   				nombre: this.subpedido,
   				grupo_de_compra_id: this.gdcid
   			}).then(response => {
-          //se creo el subpedido, guardamos el subpedido en sesion
-          this.guardarSubpedidoEnSesion(response.data);
+          //se creo el subpedido
+          this.elegirSubpedido(response.data);
   			});
   		},
+      elegirSubpedido(subpedido){
+        //lo guardamos en sesion
+        this.guardarSubpedidoEnSesion(subpedido);
+      },
       guardarSubpedidoEnSesion(subpedido) {
         axios.post("/subpedidos/guardar_sesion", {
           subpedido: subpedido
diff --git a/resources/views/subpedidos_create.blade.php b/resources/views/subpedidos_create.blade.php
index 9c58328..3704b8e 100644
--- a/resources/views/subpedidos_create.blade.php
+++ b/resources/views/subpedidos_create.blade.php
@@ -31,7 +31,7 @@
   				<div class="columns is-mobile" v-for="(subpedidoExistente, index) in subpedidosExistentes" :class="{'has-background-grey-lighter': index % 2}">
   					<div class="column is-half-mobile is-two-thirds-desktop is-two-thirds-tablet"><p style="padding-top: calc(.5em - 1px); margin-bottom: .5rem" v-text="subpedidoExistente.nombre"></p></div>
 					<div class="buttons column is-half-mobile is-one-third-desktop is-one-third-tablet">
-					  	<button class="button is-danger" @click="guardarSubpedidoEnSesion(subpedidoExistente)">Continuar pedido</button>
+						<button class="button is-danger" @click="elegirSubpedido(subpedidoExistente)">Continuar pedido</button>
   					</div>
   				</div>
 			</div>		
diff --git a/routes/web.php b/routes/web.php
index fe531b9..8a4a4a0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -35,5 +35,15 @@ Route::middleware('auth')->group( function() {
 	        session(["subpedido_id" => $r["subpedido"]["id"]]);
 	        return "Subpedido guardado en sesión";
 		})->name('guardarSesion');
+
+		Route::get('obtener_sesion', function() {
+			$sesion = [
+				'subpedido' => [
+					'nombre' => session("subpedido_nombre"),
+					'id' => session("subpedido_id")
+				]
+			];
+	        return $sesion;
+		})->name('obtenerSesion');
 	});
 });