TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-30 21:21:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix floating errors

Browse Source
This commit is contained in:
Mohit Panjwani
2020-12-31 12:16:04 +05:30
parent 0f1d7627ea
commit b55f8e5391
11 changed files with 498 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
resources/assets/js/views/estimates/Create.vue
View File

@ -7,23 +7,23 @@
<sw-page-header :title="pageTitle">
<sw-breadcrumb slot="breadcrumbs">
<sw-breadcrumb-item
to="/admin/dashboard"
:title="$t('general.home')"
to="/admin/dashboard"
/>
<sw-breadcrumb-item
to="/admin/estimates"
:title="$tc('estimates.estimate', 2)"
to="/admin/estimates"
/>
<sw-breadcrumb-item
v-if="$route.name === 'estimates.edit'"
to="#"
:title="$t('estimates.edit_estimate')"
to="#"
active
/>
<sw-breadcrumb-item
v-else
to="#"
:title="$t('estimates.new_estimate')"
to="#"
active
/>
</sw-breadcrumb>
@ -31,8 +31,8 @@
<template slot="actions">
<sw-button
v-if="$route.name === 'estimates.edit'"
tag-name="a"
:href="`/estimates/pdf/${newEstimate.unique_hash}`"
tag-name="a"
target="_blank"
class="mr-3"
variant="primary-outline"
@ -59,9 +59,9 @@
<!-- Select Customer & Basic Fields -->
<div class="grid-cols-12 gap-8 mt-6 mb-8 lg:grid">
<customer-select
class="col-span-5 pr-0"
:valid="$v.selectedCustomer"
:customer-id="customerId"
class="col-span-5 pr-0"
/>
<div
@ -235,8 +235,8 @@
</div>
<div
class="grid gap-x-4 gap-y-2 md:gap-x-8 md:gap-y-4 grid-col-1 md:grid-cols-2"
v-if="customFields.length > 0"
class="grid gap-x-4 gap-y-2 md:gap-x-8 md:gap-y-4 grid-col-1 md:grid-cols-2"
>
<sw-input-group
v-for="(field, index) in customFields"
@ -247,7 +247,7 @@
<component
:type="field.type.label"
:field="field"
:isEdit="isEdit"
:is-edit="isEdit"
:is="field.type + 'Field'"
:invalid-fields="invalidFields"
@update="setCustomFieldValue"
@ -366,8 +366,8 @@
</div>
<sw-popup
ref="taxModal"
v-if="taxPerItem === 'NO' || taxPerItem === null"
ref="taxModal"
class="my-3 text-sm font-semibold leading-5 text-primary-400"
>
<div slot="activator" class="float-right pt-2 pb-4">
@ -425,8 +425,6 @@ const {
} = require('vuelidate/lib/validators')
export default {
mixins: [CustomFieldsMixin],
components: {
EstimateItem,
CustomerSelect,
@ -438,6 +436,7 @@ export default {
PlusSmIcon,
HashtagIcon,
},
mixins: [CustomFieldsMixin],
data() {
return {
@ -563,7 +562,7 @@ export default {
if (this.newEstimate.discount_type === 'percentage') {
this.newEstimate.discount_val = (this.subtotal * newValue) / 100
} else {
this.newEstimate.discount_val = newValue * 100
this.newEstimate.discount_val = Math.round(newValue * 100)
}
this.newEstimate.discount = newValue
@ -727,7 +726,9 @@ export default {
return
}
this.newEstimate.discount_val = this.newEstimate.discount * 100
this.newEstimate.discount_val = Math.round(
this.newEstimate.discount * 100
)
this.newEstimate.discount_type = 'fixed'
},

6
resources/assets/js/views/estimates/Item.vue
View File

@ -256,7 +256,7 @@ export default {
if (this.item.discount_type === 'percentage') {
this.item.discount_val = (this.subtotal * newValue) / 100
} else {
this.item.discount_val = newValue * 100
this.item.discount_val = Math.round(newValue * 100)
}
this.item.discount = newValue
@ -296,7 +296,7 @@ export default {
},
set: function (newValue) {
if (parseFloat(newValue) > 0) {
this.item.price = (newValue * 100).toFixed(2)
this.item.price = Math.round(newValue * 100)
this.maxDiscount = this.item.price
} else {
this.item.price = newValue
@ -411,7 +411,7 @@ export default {
return
}
this.item.discount_val = this.item.discount * 100
this.item.discount_val = Math.round(this.item.discount * 100)
this.item.discount_type = 'fixed'
},
selectPercentage() {