ETA/WebETA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes: vehicles & proposals

Browse Source
This commit is contained in:
Alexandro Uc Santos
2024-08-02 19:05:46 -06:00
parent 0870d96f73
commit 75af1a9bf4
10 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/CardLoad.vue
View File

@@ -121,7 +121,7 @@
</div>
<div class="col-lg-6 col-sm-12" v-if="authStore.user?.permissions === 'role_shipper'">
<p><span>{{t('loads.postStatus')}}:</span> <span class="simple">{{ getStatusPublished(load) }}</span></p>
<p :style="{color: getStatusLoad(load).color}"><span>{{t('loads.loadStatus')}}:</span> <spa class="simple">{{ getStatusLoad(load).status }}</spa></p>
<p :style="{color: getStatusLoad(load).color}"><span>{{t('loads.loadStatus')}}:</span> <span class="simple">{{ getStatusLoad(load).status }}</span></p>
</div>
</div>
<div class="divider"></div>
@@ -140,16 +140,12 @@
<div class="col-lg-4 col-sm-12">
<p><span>{{t('global.segment')}}: </span> {{ load.categories?.map((e) => e.name).join(', ') }}</p>
<p><span>{{t('loads.loadCode')}}: </span> {{ load.shipment_code }}
<!-- <RouterLink
<span
v-if="load.load_status !== 'Draft' && !readOnly"
class="tracking-icon"
:to="{name: 'tracking-load', params: load.shipment_code}"
target="_blank">
<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="bi bi-geo-alt-fill" viewBox="0 0 16 16">
<path d="M8 16s6-5.686 6-10A6 6 0 0 0 2 6c0 4.314 6 10 6 10zm0-7a3 3 0 1 1 0-6 3 3 0 0 1 0 6z"></path>
</svg>
</RouterLink> -->
<span v-if="load.load_status !== 'Draft' && !readOnly" class="tracking-icon" @click="handleTracking" data-target="_blank">
@click="handleTracking"
data-target="_blank"
>
<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="bi bi-geo-alt-fill" viewBox="0 0 16 16">
<path d="M8 16s6-5.686 6-10A6 6 0 0 0 2 6c0 4.314 6 10 6 10zm0-7a3 3 0 1 1 0-6 3 3 0 0 1 0 6z"></path>
</svg>
@@ -198,12 +194,6 @@
data-target="#makeProposalModal"
@click="event => $emit('set-load')"
>{{t('loads.makeOffer')}}</button>
<!-- <button
class="btn-primary-sm"
@click="makeCall('+529889662382')"
data-toggle="modal"
data-target="#proposalsModal"
><i class="fa-solid fa-phone clear-sm"></i> Llamar ahora</button> -->
</div>
</div>
</template>

5
src/components/CardUser.vue
View File

@@ -1,6 +1,7 @@
<script setup>
import Swal from 'sweetalert2';
import { getDateMonthDay } from '../helpers/date_formats';
import { getTypeUser } from '../helpers/type_user';
import { useCompanyStore } from '../stores/company';
import { useAuthStore } from '../stores/auth';
import { useI18n } from 'vue-i18n';
@@ -22,7 +23,7 @@
const companyStore = useCompanyStore();
const authStore = useAuthStore();
const { t } = useI18n()
const { t, locale } = useI18n()
const handleDelete = async() => {
Swal.fire({
@@ -72,7 +73,7 @@
<div class="col-lg-6 col-sm-12">
<p><span>{{ t('labels.names') }}:</span> {{user.first_name}} {{user.last_name}}</p>
<p v-if="user.employee_id"><span class="font-weight-bold mr-1">{{ t('labels.registryNumber') }}:</span> {{user.employee_id}}</p>
<p><span>{{ t('labels.userRole') }}: </span>{{user.job_role}}</p>
<p><span>{{ t('labels.userRole') }}: </span>{{ getTypeUser(user.job_role, locale) }}</p>
<p><span>{{ t('labels.phone1') }}: </span>{{user.phone}}</p>
<!-- <p><span>Teléfono 2: </span>{{user.phone2}}</p> -->
<p><span>{{ t('labels.email') }}: </span>{{user.email}}</p>

2
src/components/LoadDetailModal.vue
View File

@@ -32,7 +32,6 @@
}
})
defineEmits(['reset-proposal'])
const loadStore = useLoadsStore();
const notyStore = useNotificationsStore();
@@ -50,6 +49,7 @@
const initData = async() => {
isLoading.value = true;
const code = props.proposal.load.shipment_code;
// console.log(props.proposal)
const filter = "?shipment_code[$in]=" + code;
const resp = await loadStore.getLoad(filter);
if(resp.total > 0) {

2
src/components/StatusVehicleModal.vue
View File

@@ -154,7 +154,7 @@
<span class="error-msg" v-if="errors.city">{{ errors.city }}</span>
</div>
<CustomInput
:label="t('loads.destination') + '*'"
:label="t('vehicles.availableIn') + '*'"
type="text"
:filled="false"
name="destino"

1
src/helpers/date_formats.js
View File

@@ -58,7 +58,6 @@ export const getDateMonthDay = (value) => {
};
export const getDateMonthDayEs = (value, isFull = false) => {
console.log(value);
const date = new Date(value)
let month = '';
if(isFull) {

10
src/helpers/type_company.js
View File

@@ -1,15 +1,15 @@
export const getTypeCompany = (value) => {
export const getTypeCompany = (value, locale = 'es') => {
switch (value) {
case 'Shipper':
return 'Embarcador'
return (locale == 'es') ? 'Embarcador' : 'Shipper';
case 'Carrier':
return 'Transportista'
return (locale == 'es') ? 'Transportista' : 'Carrier';
case 'Shipper-Broker':
return 'Embarcador Broker'
return (locale == 'es') ? 'Embarcador Broker' : 'Shipper broker';
case 'Carrier-Broker':
return 'Transportista Broker'
return (locale == 'es') ? 'Transportista Broker' : 'Carrier broker';
default:
return 'No definido';

15
src/helpers/type_user.js Normal file
View File

@@ -0,0 +1,15 @@
export const getTypeUser = (value, locale = 'es') => {
switch (value) {
case 'staff':
return (locale == 'es') ? 'Personal' : 'Staff';
case 'driver':
return (locale == 'es') ? 'Conductor' : 'Driver';
case 'manager':
return (locale == 'es') ? 'Gerente' : 'Manager';
case 'owner':
return (locale == 'es') ? 'Propietario' : 'Owner';
default:
return (locale == 'es') ? 'Personal' : 'Staff';
}
}

2
src/i18n/es.js
View File

@@ -22,7 +22,7 @@ const es = {
selectProduct: 'Buscar por producto',
names: 'Nombre(s)',
lastnames: 'Apellido(s)',
phone1: 'Teléfono',
phone: 'Teléfono',
phone1: 'Teléfono 1',
phone2: 'Teléfono 2',
typeCompany: 'Tipo de empresa',

2
src/stores/company.js
View File

@@ -175,7 +175,7 @@ export const useCompanyStore = defineStore('company', () => {
try {
if(proposals.value.length <= 0 || reload) {
const endpoint = `/v1/proposals/find?carrier=${companyId}&${filter}&$sort%5BcreatedAt%5D=-1`;
console.log(endpoint)
// console.log(endpoint)
const {data} = await api.get(endpoint);
proposals.value = data.data;
proposalsTotal.value = data.total;

6
src/views/MyCompanyView.vue
View File

@@ -12,7 +12,7 @@
const auth = useAuthStore()
const company = useCompanyStore();
const { user } = storeToRefs(auth);
const { t } = useI18n()
const { t, locale } = useI18n()
onMounted(() => {
if(user.value) {
@@ -61,7 +61,7 @@
</div> -->
<div class="item-company">
<span class="font-weight-bold">{{ t('labels.typeCompany') }}: </span>
{{getTypeCompany(company.company?.company_type)}}
{{getTypeCompany(company.company?.company_type, locale)}}
</div>
<div class="item-company">
<span class="font-weight-bold">{{ t('labels.codeId') }}: </span>
@@ -69,7 +69,7 @@
</div>
<div class="item-company">
<span class="font-weight-bold">{{ t('labels.dateMembership') }}: </span>
{{getDateMonthDay(company.company?.createAt)}}
{{getDateMonthDay(company.company?.createdAt)}}
</div>
<div class="item-company">
<span class="font-weight-bold">{{ t('labels.segmentsCompany') }}: </span>