From 2177d676eb305d27481a1f78fa796e3fa4d8564c Mon Sep 17 00:00:00 2001
From: Alexandro Uc Santos <alexandro.us@icloud.com>
Date: Tue, 17 Jun 2025 19:00:57 -0600
Subject: [PATCH] add: origin, destination & campany name in proposalCard

---
 src/components/CardLoad.vue     | 24 ++++++++++++------------
 src/components/CardProposal.vue | 23 ++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/components/CardLoad.vue b/src/components/CardLoad.vue
index 7b893d5..9c8fd54 100644
--- a/src/components/CardLoad.vue
+++ b/src/components/CardLoad.vue
@@ -124,21 +124,21 @@
             <div class="col-lg-6 col-sm-12">
                 <p>
                     <span>{{t('loads.origin')}}: </span> 
-                    <template v-if="load.origin?.company_name"> {{ load.origin?.company_name }}, </template> 
-                    <template v-if="load.origin?.street_address1">{{ load.origin?.street_address1 }}, </template>
-                    <template v-if="load.origin?.city">{{ load.origin?.city }}, </template>
-                    <template v-if="load.origin?.state">{{ load.origin?.state }}, </template>
-                    <template v-if="load.origin?.country">{{ load.origin?.country }}, </template>
-                    <template v-if="load.origin?.zipcode">{{ load.origin?.zipcode }} </template>
+                    <template v-if="load.origin?.company_name">{{ load.origin?.company_name }}</template> 
+                    <template v-if="load.origin?.street_address1">, {{ load.origin?.street_address1 }}</template>
+                    <template v-if="load.origin?.city">, {{ load.origin?.city }}</template>
+                    <template v-if="load.origin?.state">, {{ load.origin?.state }}</template>
+                    <template v-if="load.origin?.country">, {{ load.origin?.country }}</template>
+                    <template v-if="load.origin?.zipcode">, {{ load.origin?.zipcode }}</template>
                 </p>
                 <p>
                     <span>{{t('loads.destination')}}: </span> 
-                    <template v-if="load.destination?.company_name"> {{ load.destination?.company_name }}, </template> 
-                    <template v-if="load.destination?.street_address1">{{ load.destination?.street_address1 }}, </template>
-                    <template v-if="load.destination?.city">{{ load.destination?.city }}, </template>
-                    <template v-if="load.destination?.state">{{ load.destination?.state }}, </template>
-                    <template v-if="load.destination?.country">{{ load.destination?.country }}, </template>
-                    <template v-if="load.destination?.zipcode">{{ load.destination?.zipcode }} </template>
+                    <template v-if="load.destination?.company_name"> {{ load.destination?.company_name }}</template> 
+                    <template v-if="load.destination?.street_address1">, {{ load.destination?.street_address1 }}</template>
+                    <template v-if="load.destination?.city">, {{ load.destination?.city }}</template>
+                    <template v-if="load.destination?.state">, {{ load.destination?.state }}</template>
+                    <template v-if="load.destination?.country">, {{ load.destination?.country }}</template>
+                    <template v-if="load.destination?.zipcode">, {{ load.destination?.zipcode }}</template>
                 </p>
             </div>
             <div class="col-lg-6 col-sm-12">
diff --git a/src/components/CardProposal.vue b/src/components/CardProposal.vue
index 4880700..742b433 100644
--- a/src/components/CardProposal.vue
+++ b/src/components/CardProposal.vue
@@ -102,7 +102,28 @@
                         class="code-enruta"
                         @click="$emit('set-proposal', {proposal: proposal, modal: 'detail'})"
                         data-toggle="modal" data-target="#loadDetailModal"
-                    >{{proposal.load.shipment_code.toUpperCase()}}</span></p>
+                    >{{proposal.load.shipment_code.toUpperCase()}}
+                    </span>
+                </p>
+                <p><span>{{ t('global.company') }}: </span>{{ proposal.load?.company?.company_name }}</p>
+                <p>
+                    <span>{{t('loads.origin')}}: </span> 
+                    <template v-if="proposal.load.origin?.company_name"> {{ proposal.load.origin?.company_name }}</template> 
+                    <template v-if="proposal.load.origin?.street_address1">, {{ proposal.load.origin?.street_address1 }}</template>
+                    <template v-if="proposal.load.origin?.city">, {{ proposal.load.origin?.city }}</template>
+                    <template v-if="proposal.load.origin?.state">, {{ proposal.load.origin?.state }}</template>
+                    <template v-if="proposal.load.origin?.country">, {{ proposal.load.origin?.country }}</template>
+                    <template v-if="proposal.load.origin?.zipcode">, {{ proposal.load.origin?.zipcode }}</template>
+                </p>
+                <p>
+                    <span>{{t('loads.destination')}}: </span> 
+                    <template v-if="proposal.load.destination?.company_name">{{ proposal.load.destination?.company_name }}</template> 
+                    <template v-if="proposal.load.destination?.street_address1">, {{ proposal.load.destination?.street_address1 }}</template>
+                    <template v-if="proposal.load.destination?.city">, {{ proposal.load.destination?.city }}</template>
+                    <template v-if="proposal.load.destination?.state">, {{ proposal.load.destination?.state }}</template>
+                    <template v-if="proposal.load.destination?.country">, {{ proposal.load.destination?.country }}</template>
+                    <template v-if="proposal.load.destination?.zipcode">{{ proposal.load.destination?.zipcode }}</template>
+                </p>
                 <p v-if="proposal.vehicle" :style="{color: getStatusLoad(proposal.load, locale).color, fontWeight: 'bold'}"><span>{{  t('loads.loadStatus') }}:</span> {{ getStatusLoad(proposal.load, locale).status}}</p>
                 <p v-if="proposal._driver">{{ t('labels.operator') }}: {{proposal._driver}}</p>