nathalie/pedi2
3
3
Fork 1
Code Issues Pull requests 2 Projects Releases Wiki Activity

WIP: funcion/faltantes-y-sobrantes #52

Draft
atasistro wants to merge 39 commits from funcion/faltantes-y-sobrantes into master
pull from: funcion/faltantes-y-sobrantes
merge into: nathalie:master
Conversation 0 Commits 39 Files changed 21 +3 -1
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5f847dc9af - Show all commits

4
resources/js/components/admin/Body.vue
View file

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<canasta v-if="show_faltantes_y_sobrantes"/> <pedidos-main v-if="show_faltantes_y_sobrantes"/>
<div class="block ml-3 mr-3 is-max-widescreen is-max-desktop" v-else> <div class="block ml-3 mr-3 is-max-widescreen is-max-desktop" v-else>
<tabs-secciones :tabs="tabs" :tabInicial="tabActiva"/> <tabs-secciones :tabs="tabs" :tabInicial="tabActiva"/>
<div class="block" id="pedidos-seccion" <div class="block" id="pedidos-seccion"
@ -36,9 +36,11 @@ import DropdownDescargar from "./DropdownDescargar.vue";
import TablaPedidos from "./TablaPedidos.vue"; import TablaPedidos from "./TablaPedidos.vue";
import { mapActions, mapGetters, mapMutations, mapState } from "vuex"; import { mapActions, mapGetters, mapMutations, mapState } from "vuex";
import Canasta from "../pedidos/Canasta.vue"; import Canasta from "../pedidos/Canasta.vue";
import PedidosMain from "../pedidos/PedidosMain.vue";
export default { export default {
name: "AdminBody", name: "AdminBody",
components: { components: {
PedidosMain,
Canasta, Canasta,
CaracteristicasOpcionales, CaracteristicasOpcionales,
TabsSecciones, TabsSecciones,