merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2011 from jitendra-webkul/1.0 

Tax rates for all states
This commit is contained in:
Jitendra Singh 2020-01-07 19:37:42 +05:30 committed by GitHub
parent ebddf578b1 fbfd710f1c
commit a0c02e6c4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 148 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
View File

@ -45,7 +45,7 @@
<span class="control-error" v-if="errors.has('identifier')">@{{ errors.first('identifier') }}</span>
</div>
@include ('admin::customers.country-state', ['countryCode' => old('country'), 'stateCode' => old('state')])
<country-state></country-state>
<div class="control-group">
<span class="checkbox">
@ -83,6 +83,50 @@
</div>
</script>
<script type="text/x-template" id="country-state-template">
<div>
<div class="control-group" :class="[errors.has('country') ? 'has-error' : '']">
<label for="country" class="required">
{{ __('admin::app.customers.customers.country') }}
</label>
<select type="text" v-validate="'required'" class="control" id="country" name="country" v-model="country" data-vv-as="&quot;{{ __('admin::app.customers.customers.country') }}&quot;">
<option value=""></option>
@foreach (core()->countries() as $country)
<option value="{{ $country->code }}">{{ $country->name }}</option>
@endforeach
</select>
<span class="control-error" v-if="errors.has('country')">
@{{ errors.first('country') }}
</span>
</div>
<div class="control-group" :class="[errors.has('state') ? 'has-error' : '']">
<label for="state">
{{ __('admin::app.customers.customers.state') }}
</label>
<select class="control" id="state" name="state" v-model="state">
<option value="" :selected="! haveStates()">*</option>
<option v-for='(state, index) in countryStates[country]' :value="state.code">
@{{ state.default_name }}
</option>
</select>
<span class="control-error" v-if="errors.has('state')">
@{{ errors.first('state') }}
</span>
</div>
</div>
</script>
<script>
Vue.component('tax-rate-form', {
@ -96,5 +140,31 @@
}
},
});
Vue.component('country-state', {
template: '#country-state-template',
inject: ['$validator'],
data: function () {
return {
country: "{{ old('country') }}",
state: "{{ old('state') }}",
countryStates: @json(core()->groupedStatesByCountries())
}
},
methods: {
haveStates: function () {
if (this.countryStates[this.country] && this.countryStates[this.country].length)
return true;
return false;
},
}
});
</script>
@endpush

79
packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php
View File

@ -36,7 +36,7 @@
<span class="control-error" v-if="errors.has('identifier')">@{{ errors.first('identifier') }}</span>
</div>
@include ('admin::customers.country-state', ['countryCode' => old('country') ?? $taxRate->country, 'stateCode' => old('state') ?? $taxRate->state])
<country-state></country-state>
@if ($taxRate->is_zip)
<input type="hidden" id="is_zip" name="is_zip" value="{{ $taxRate->is_zip }}">
@ -70,4 +70,79 @@
</div>
</form>
</div>
@stop
@stop
@push('scripts')
<script type="text/x-template" id="country-state-template">
<div>
<div class="control-group" :class="[errors.has('country') ? 'has-error' : '']">
<label for="country" class="required">
{{ __('admin::app.customers.customers.country') }}
</label>
<select type="text" v-validate="'required'" class="control" id="country" name="country" v-model="country" data-vv-as="&quot;{{ __('admin::app.customers.customers.country') }}&quot;">
<option value=""></option>
@foreach (core()->countries() as $country)
<option value="{{ $country->code }}">{{ $country->name }}</option>
@endforeach
</select>
<span class="control-error" v-if="errors.has('country')">
@{{ errors.first('country') }}
</span>
</div>
<div class="control-group" :class="[errors.has('state') ? 'has-error' : '']">
<label for="state">
{{ __('admin::app.customers.customers.state') }}
</label>
<select class="control" id="state" name="state" v-model="state">
<option value="" :selected="! haveStates()">*</option>
<option v-for='(state, index) in countryStates[country]' :value="state.code">
@{{ state.default_name }}
</option>
</select>
<span class="control-error" v-if="errors.has('state')">
@{{ errors.first('state') }}
</span>
</div>
</div>
</script>
<script>
Vue.component('country-state', {
template: '#country-state-template',
inject: ['$validator'],
data: function () {
return {
country: "{{ old('country') ?? $taxRate->country }}",
state: "{{ old('state') ?? $taxRate->state }}",
countryStates: @json(core()->groupedStatesByCountries())
}
},
methods: {
haveStates: function () {
if (this.countryStates[this.country] && this.countryStates[this.country].length)
return true;
return false;
},
}
});
</script>
@endpush