Compare commits

..

18 Commits

Author SHA1 Message Date
16abc30b9f Merge branch 'develop' into feat/276-lister-expeditions-terminees
# Conflicts:
#	CHANGELOG.md
2026-02-12 09:58:16 +01:00
7e2f23c6b6 Merge remote-tracking branch 'origin/develop' into feat/276-lister-expeditions-terminees
# Conflicts:
#	CHANGELOG.md
2026-02-12 09:24:56 +01:00
886b90215a feat : lister les expeditions terminees 2026-02-12 08:58:29 +01:00
265e85b8f4 Merge branch 'refs/heads/develop' into feat/276-lister-expeditions-terminees 2026-02-12 08:57:48 +01:00
b4e024590e feat : changelog 2026-02-12 08:30:34 +01:00
74af5d30ba feat : ajout d'une page de creation d'une expedition 2026-02-12 08:19:47 +01:00
b905cb66aa Merge branch 'refs/heads/develop' into feat/271-expedition-etape-1
# Conflicts:
#	CHANGELOG.md
2026-02-12 08:18:17 +01:00
5f4139fde3 feat : ajout d'une page de creation d'une expedition 2026-02-11 16:12:33 +01:00
0181d72144 Merge branch 'develop' into feat/271-expedition-etape-1 2026-02-11 08:03:12 +01:00
bffdc88701 feat : creer une nouvelle expedtion (WIP) 2026-02-10 16:16:05 +01:00
42c5a3b2d2 Merge branch 'develop' into feat/271-expedition-etape-1
# Conflicts:
#	.idea/data_source_mapping.xml
#	src/Entity/Carrier.php
2026-02-10 08:59:24 +01:00
28d5bc7599 Merge remote-tracking branch 'refs/remotes/origin/develop' into feat/271-expedition-etape-1
# Conflicts:
#	.idea/workspace.xml
2026-02-05 10:47:05 +01:00
69d047fca0 feat : #271 -Créer une nouvelle expédition 2026-02-05 09:10:52 +01:00
ba4375f609 feat : Expedition dev back-end WIP 2026-02-04 16:58:55 +01:00
e249d44e78 feat : mise à jour du bon de réception WIP 2026-02-03 17:34:35 +01:00
e8189a4d04 feat : mise à jour du bon de réception WIP 2026-02-03 17:32:39 +01:00
081c2ef403 feat : mise à jour du bon de réception WIP 2026-02-03 17:16:47 +01:00
5fd2ab8470 feat : mise à jour du bon de réception wip 2026-02-03 17:16:19 +01:00
5 changed files with 1 additions and 129 deletions

View File

@@ -43,7 +43,6 @@ Ajouter dans le fichier .env du frontend
* [#313] Admin modification creation fournisseur
* [#275] Lister les expéditions en attente
* [#276] Lister les expéditions terminées
* [#324] Creation page admin listing clients
### Changed

View File

@@ -1,2 +1,2 @@
parameters:
app.version: '0.0.42'
app.version: '0.0.41'

View File

@@ -36,9 +36,6 @@
<NuxtLink to="/admin/user/list">
Utilisateurs
</NuxtLink>
<NuxtLink to="/admin/customer/customer-list">
Client
</NuxtLink>
</div>
<div class="p-4">

View File

@@ -1,12 +0,0 @@
<template>
</template>
<script setup lang="ts">
definePageMeta({layout: "admin"})
const route = useRoute()
const router = useRouter()
const auth = useAuthStore()
</script>

View File

@@ -1,112 +0,0 @@
<template>
<div class="flex items-center justify-between">
<h1 class="text-3xl font-bold uppercase">Client</h1>
<NuxtLink
to="/admin/customer"
class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
:class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
@click="handleAddClick"
>
Ajouter
</NuxtLink>
</div>
<div v-if="auth.isAdmin" class="mt-6 border border-slate-200 mb-16">
<div class="max-h-96 overflow-y-auto">
<div
class="sticky top-0 z-10 grid grid-cols-7 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
>
<div>Nom</div>
<div>Code</div>
<div>Rue</div>
<div>Complément</div>
<div>Code Postal</div>
<div>Ville</div>
<div>Pays</div>
</div>
<div v-if="customerList.length === 0" class="px-4 py-6 text-slate-400">
Aucun fournisseur.
</div>
<div v-for="customer in customerList" :key="customer.id">
<div
v-if="!customer.addresses || customer.addresses.length === 0"
class="grid grid-cols-7 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
@click="goToCustomer(customer.id)"
>
<div class="truncate">{{ customer.label }}</div>
<div class="truncate">{{ customer.code }}</div>
<div class="col-span-1">Pas d'adresse</div>
<div class="uppercase truncate">{{"—"}}</div>
<div class="uppercase truncate">{{"—"}}</div>
<div class="uppercase truncate">{{"—"}}</div>
<div class="uppercase truncate">{{"—"}}</div>
</div>
<template v-else-if="customer.addresses.length > 0">
<div
v-for="(address, idx) in customer.addresses"
:key="address.id ?? `${customer.id}-${idx}-${address.street}-${address.postalCode}`"
class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
:class="idx > 0 ? 'pl-4 border-l-4 border-l-slate-200 bg-slate-50' : ''"
@click="goToCustomer(customer.id)"
>
<div class="truncate">
{{ idx === 0 ? customer.label : "" }}
</div>
<div class="truncate">{{ idx === 0 ? customer.code : "" }}</div>
<div class="truncate">{{ address.street || "" }}</div>
<div class="truncate">{{ address.street2 || "" }}</div>
<div>{{ address.postalCode || "" }}</div>
<div class="uppercase truncate">{{ address.city || "" }}</div>
<div class="uppercase truncate">{{ address.countryCode || "" }}</div>
</div>
</template>
<template v-else>
<div
class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
@click="goToCustomer(customer.id)"
>
<div class="truncate">{{ customer.label }}</div>
<div class="truncate">{{ customer.code }}</div>
<div class="col-span-5 text-slate-400">
Adresses non chargées
</div>
</div>
</template>
</div>
</div>
</div>
<div v-else class="mt-6 border border-slate-200 mb-16 px-4 py-6 text-slate-400">
Accès réservé aux administrateurs.
</div>
</template>
<script setup lang="ts">
import { getCustomerList } from "~/services/customer"
import type { CustomerData } from "~/services/dto/customer-data"
import { useAuthStore } from "~/stores/auth"
definePageMeta({ layout: "admin" })
const customerList = ref<CustomerData[]>([])
const router = useRouter()
const auth = useAuthStore()
const goToCustomer = (id: number) => {
if (!auth.isAdmin) return
router.push(`/admin/customer/${id}`)
}
const handleAddClick = (event: Event) => {
if (auth.isAdmin) return
event.preventDefault()
}
onMounted(async () => {
if (!auth.isAdmin) return
customerList.value = await getCustomerList()
})
</script>