Merge branch 'refs/heads/develop' into feat/355-modification-front-de-la-page-admin-transporteur

CHANGELOG.md

@@ -55,7 +55,8 @@ Ajouter dans le fichier .env du frontend
 * [#332] Refonte écran réception terminée
 * [#327] afficher/modifier écran expédition terminée
 * [#352] modification front admin fournisseur
-* [#355] afficher/modifier écran expédition terminée
+
+* [#3] afficher/modifier écran expédition terminée
 ### Changed
 
 ### Fixed

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.64'
+    app.version: '0.0.63'

frontend/components/address.vue

@@ -18,13 +18,14 @@
             <UiTextInput id="address-country" v-model="form.countryCode" label="Pays (code)" />
         </div>
         <div class="flex justify-center items-center">
-        <UiButton
+        <button
-            class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
+            class="inline-flex items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
             type="submit"
             :disabled="isLoading"
         >
-            Valider
+            <Icon :name="props.address ? '' : 'mdi:plus'" size="28" />
-        </UiButton>
+            {{ props.address? "Valider" : "Ajouter" }}
+        </button>
         </div>
     </form>
 </template>

frontend/pages/admin/carrier/[[id]].vue

@@ -31,7 +31,7 @@
         <div class="flex justify-center items-center">
             <UiButton
                 type="submit"
-                class="inline-flex items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
+                class="inline-flex items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2 justify-self-end"
             >
                 Valider
             </UiButton>

frontend/pages/admin/supplier/[[id]].vue

@@ -17,7 +17,7 @@
         </div>
         <div class="flex items-center justify-center">
             <UiButton
-                class="inline-flex mb-28 items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
+                class="inline-flex items-center mb-[106px] justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
             >
@@ -71,7 +71,7 @@
         <div class="flex justify-center items-center">
         <UiButton
             type="button"
-            class="inline-flex items-center justify-center text-xl gap-2 text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
+            class="inline-flex items-center mb-16 justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
             :disabled="supplierId === null || !auth.isAdmin"
             @click="goToAddAddress"
         >