funcion/arreglos-ollas #50

Merged
atasistro merged 3 commits from funcion/arreglos-ollas into master 2025-08-12 15:06:42 -03:00
4 changed files with 15 additions and 7 deletions

View file

@ -133,10 +133,12 @@ class GrupoDeCompra extends Model
*/ */
public function exportarPedidosAPdf() public function exportarPedidosAPdf()
{ {
$subpedidos = $this->pedidosAprobados();
$fecha = now()->format('Y-m-d'); $fecha = now()->format('Y-m-d');
$filepath = $this->nombre . '-' . $fecha . '.pdf'; $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 function pedidoParaPdf(): array

View file

@ -14,7 +14,7 @@
<burger/> <burger/>
</div> </div>
<div class="navbar-menu" :class="{'is-active': burger_activa}"> <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"> <div v-if="mostrarAviso" class="is-absolute-center is-flex is-align-items-center navbar-item">
<span class="tag is-warning is-size-6"> <span class="tag is-warning is-size-6">
Monto superado Monto superado

View file

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

View file

@ -27,7 +27,7 @@ export default defineComponent({
<nav-migas/> <nav-migas/>
<cantidad-ollas v-if="rol === 'ollas'"/> <cantidad-ollas v-if="rol === 'ollas'"/>
<div class="columns"> <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> <slot name="cartel"></slot>
<canasta/> <canasta/>
</div> </div>