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

fix the conflict

Browse Source
This commit is contained in:
hastichavda
2019-11-12 11:04:55 +05:30
parent 03d18065c6 0fbc26bbe1
commit 905064e0be
18 changed files with 121 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/assets/js/components/base/modal/CustomerModal.vue
View File

@ -56,9 +56,9 @@
:options="currencies"
:searchable="true"
:show-labels="false"
:placeholder="$t('customers.select_currency')"
label="name"
track-by="id"
placeholder="select currency"
/>
</div>
</div>
@ -130,9 +130,9 @@
<div class="col-sm-7">
<base-text-area
v-model="billing.address_street_1"
:placeholder="$t('general.street_1')"
rows="2"
cols="50"
placeholder="Street 1"
class="mb-1"
@input="$v.billing.address_street_1.$touch()"
/>
@ -142,9 +142,9 @@
<base-text-area
v-model="billing.address_street_2"
:placeholder="$t('general.street_2')"
rows="2"
cols="50"
placeholder="Street 2"
@input="$v.billing.address_street_2.$touch()"
/>
@ -162,10 +162,10 @@
:options="countryList"
:searchable="true"
:show-labels="false"
:placeholder="$t('general.select_country')"
:allow-empty="false"
track-by="id"
label="name"
placeholder="select country"
/>
</div>
</div>
@ -178,10 +178,10 @@
:options="billingStates"
:searchable="true"
:show-labels="false"
:placeholder="$t('general.select_state')"
:disabled="isDisabledBillingState"
track-by="id"
label="name"
placeholder="select state"
/>
</div>
</div>
@ -194,10 +194,10 @@
:options="billingCities"
:searchable="true"
:show-labels="false"
:placeholder="$t('general.select_city')"
:disabled="isDisabledBillingCity"
track-by="id"
label="name"
placeholder="select city"
/>
</div>
</div>
@ -314,10 +314,10 @@
:options="shippingStates"
:searchable="true"
:show-labels="false"
:placeholder="$t('general.select_state')"
:disabled="isDisabledShippingState"
track-by="id"
label="name"
placeholder="select state"
/>
</div>
</div>
@ -330,10 +330,10 @@
:options="shippingCities"
:searchable="true"
:show-labels="false"
:placeholder="$t('general.select_city')"
:disabled="isDisabledShippingCity"
track-by="id"
label="name"
placeholder="select city"
/>
</div>
</div>

2
resources/assets/js/components/base/modal/EstimateTemplate.vue
View File

@ -31,7 +31,7 @@
color="theme"
@click="chooseTemplate()"
>
{{ $t('general.choose_template') }}
{{ $t('general.choose') }}
</base-button>
</div>
</div>

2
resources/assets/js/components/base/modal/InvoiceTemplate.vue
View File

@ -31,7 +31,7 @@
color="theme"
@click="chooseTemplate()"
>
{{ $t('general.choose_template') }}
{{ $t('general.choose') }}
</base-button>
</div>
</div>

2
resources/assets/js/components/base/popup/TaxSelectPopup.vue
View File

@ -76,7 +76,7 @@ export default {
},
openTaxModal () {
this.openModal({
'title': 'Add Tax',
'title': this.$t('settings.tax_types.add_tax'),
'componentName': 'TaxTypeModal'
})
}