Merge pull request 'funcion/arreglos-ollas' (#50) from funcion/arreglos-ollas into master

Reviewed-on: #50

app/GrupoDeCompra.php

@@ -133,10 +133,12 @@ class GrupoDeCompra extends Model
      */
     public function exportarPedidosAPdf()
     {
-        $subpedidos = $this->pedidosAprobados();
         $fecha = now()->format('Y-m-d');
         $filepath = $this->nombre . '-' . $fecha . '.pdf';
-        PdfHelper::exportarPedidos($filepath, $subpedidos);
+        $pedidoOllas = $this->subpedidos
+            ->where('tipo_pedido_id', '=', TipoPedido::firstOrCreate(['nombre' => 'olla'])->id);
+        $pedidos = $this->pedidosAprobados()->concat($pedidoOllas);
+        PdfHelper::exportarPedidos($filepath, $pedidos);
     }
 
     function pedidoParaPdf(): array

resources/js/components/comunes/NavBar.vue

@@ -14,7 +14,7 @@
             <burger/>
         </div>
         <div class="navbar-menu" :class="{'is-active': burger_activa}">
-            <div class="navbar-start is-flex is-justify-content-center is-flex-grow-1">
+            <div class="navbar-start is-flex is-justify-content-center is-flex-grow-1 hide-below-1024">
                 <div v-if="mostrarAviso" class="is-absolute-center is-flex is-align-items-center navbar-item">
                     <span class="tag is-warning is-size-6">
                         Monto superado

resources/js/components/ollas/OllasNavBarBrand.vue

@@ -6,10 +6,14 @@ export default {
     name: "OllasNavBarBrand",
     components: { ChismosaDropdown },
     computed: {
+        ...mapGetters('ollas', ["montoTotal", "montoSuperado"]),
         ...mapGetters('pedido', ["pedidoDefinido"]),
-        ...mapGetters('ollas', ["montoTotal"]),
+        ...mapState('login', ["rol"]),
         ...mapState('ui', ["burger_activa"]),
         ...mapState('pedido', ["nombre"]),
+        mostrarAviso() {
+            return this.pedidoDefinido && this.rol === 'ollas' && this.montoSuperado;
+        }
     },
     methods: {
         ...mapActions('ollas', ["getMontoPorOlla"]),
@@ -22,12 +26,14 @@ export default {
 </script>
 
 <template>
-    <div class="navbar-item hide-below-1024">
+    <div class="navbar-item">
-        <p v-if="pedidoDefinido">{{ `${nombre}` }}</p>
         <chismosa-dropdown
             v-if="pedidoDefinido"
             class="hide-above-1023"
             ariaControls="mobile"/>
+        <span v-if="mostrarAviso" class="tag is-warning is-size-6">
+            Monto superado
+        </span>
     </div>
 </template>
 

resources/js/components/pedidos/PedidosMain.vue

@@ -27,7 +27,7 @@ export default defineComponent({
         <nav-migas/>
         <cantidad-ollas v-if="rol === 'ollas'"/>
         <div class="columns">
-            <div class="column" :class="{ 'is-two-thirds-desktop is-hidden-touch': show_chismosa }">
+            <div class="column" :class="{ 'is-two-thirds-desktop': show_chismosa }">
                 <slot name="cartel"></slot>
                 <canasta/>
             </div>