This commit is contained in:
Arc 2025-12-24 05:59:51 +00:00
parent 19dbe64e7f
commit cd0bca1c85
2 changed files with 150 additions and 147 deletions

View file

@ -1,10 +1,13 @@
<div> <div>
<q-card> <q-card>
<q-card-section> <q-expansion-item
icon="chat"
label="Messages"
header-class="text-grey"
expand-separator
>
<q-card-section class="q-pb-none">
<div class="row items-center q-col-gutter-sm"> <div class="row items-center q-col-gutter-sm">
<div class="col-auto">
<h6 class="text-subtitle1 q-my-none">Messages</h6>
</div>
<div class="col-auto"> <div class="col-auto">
<q-badge v-if="unreadMessages" color="primary" outline <q-badge v-if="unreadMessages" color="primary" outline
><span v-text="unreadMessages"></span>&nbsp; new</q-badge ><span v-text="unreadMessages"></span>&nbsp; new</q-badge
@ -22,9 +25,6 @@
</div> </div>
</div> </div>
</q-card-section> </q-card-section>
<q-card-section class="q-pa-none">
<q-separator></q-separator>
</q-card-section>
<q-card-section> <q-card-section>
<div class="row q-col-gutter-sm items-end"> <div class="row q-col-gutter-sm items-end">
<div class="col" style="min-width: 0"> <div class="col" style="min-width: 0">
@ -88,7 +88,9 @@
<strong>Reply sent for order: </strong> <strong>Reply sent for order: </strong>
</div> </div>
<div v-else-if="dm.message.type === 2"> <div v-else-if="dm.message.type === 2">
<q-badge v-if="dm.message.paid" color="green">Paid </q-badge> <q-badge v-if="dm.message.paid" color="green"
>Paid
</q-badge>
<q-badge v-if="dm.message.shipped" color="green" <q-badge v-if="dm.message.shipped" color="green"
>Shipped >Shipped
</q-badge> </q-badge>
@ -138,6 +140,7 @@
</q-card-section> </q-card-section>
</div> </div>
</q-card-section> </q-card-section>
</q-expansion-item>
</q-card> </q-card>
<div> <div>
<q-dialog v-model="showAddPublicKey" position="top"> <q-dialog v-model="showAddPublicKey" position="top">

View file

@ -1,7 +1,7 @@
{% extends "base.html" %} {% from "macros.jinja" import window_vars with context {% extends "base.html" %} {% from "macros.jinja" import window_vars with context
%} {% block page %} %} {% block page %}
<div class="row q-col-gutter-md"> <div class="row q-col-gutter-md">
<div class="col-12 col-md-7 q-gutter-y-md"> <div class="col-12 col-md-7 col-lg-8 q-gutter-y-md">
<div v-if="merchant && merchant.id"> <div v-if="merchant && merchant.id">
<q-card> <q-card>
<div class="row items-center no-wrap"> <div class="row items-center no-wrap">
@ -168,7 +168,7 @@
</q-card> </q-card>
</div> </div>
<div class="col-12 col-md-5 q-gutter-y-md"> <div class="col-12 col-md-5 col-lg-4 q-gutter-y-md">
<div v-if="g.user.admin" class="col-12 q-mb-lg"> <div v-if="g.user.admin" class="col-12 q-mb-lg">
<q-card> <q-card>
<q-card-section class="q-pa-md"> <q-card-section class="q-pa-md">
@ -342,6 +342,18 @@
</q-card-section> </q-card-section>
</q-card> </q-card>
</div> </div>
<div v-if="merchant && merchant.id" class="col-12">
<direct-messages
ref="directMessagesRef"
:inkey="g.user.wallets[0].inkey"
:adminkey="g.user.wallets[0].adminkey"
:active-chat-customer="activeChatCustomer"
:merchant-id="merchant.id"
@customer-selected="filterOrdersForCustomer"
@order-selected="showOrderDetails"
>
</direct-messages>
</div>
<div class="col-12"> <div class="col-12">
<q-card> <q-card>
<q-expansion-item <q-expansion-item
@ -370,18 +382,6 @@
</q-expansion-item> </q-expansion-item>
</q-card> </q-card>
</div> </div>
<div v-if="merchant && merchant.id" class="col-12">
<direct-messages
ref="directMessagesRef"
:inkey="g.user.wallets[0].inkey"
:adminkey="g.user.wallets[0].adminkey"
:active-chat-customer="activeChatCustomer"
:merchant-id="merchant.id"
@customer-selected="filterOrdersForCustomer"
@order-selected="showOrderDetails"
>
</direct-messages>
</div>
</div> </div>
<div> <div>