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

Merge branch 'master' of https://github.com/bagisto/bagisto into prashant

This commit is contained in:
prashant-webkul 2018-10-12 18:35:04 +05:30
parent b33d7c1aa1 bc617e8b1e
commit 1bf6ce539e
8 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -264,7 +264,7 @@ return [
'tax-categories' => [
'title' => 'Add Tax Category',
'create' => 'Create Tax Category',
'save-btn-title' => 'Save Tax Category',
'general' => 'Tax Category',
'select-channel' => 'Select Channel',
'name' => 'Name',
@ -279,6 +279,7 @@ return [
'tax-rates' => [
'title' => 'Add Tax Rate',
'save-btn-title' => 'Save Tax Rate',
'general' => 'Tax Rate',
'identifier' => 'Identifier',
'is_zip' => 'Enable Zip Range',

2
packages/Webkul/Admin/src/Resources/views/tax/tax-categories/create.blade.php
View File

@ -14,7 +14,7 @@
<div class="page-action">
<button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.configuration.tax-categories.create') }}
{{ __('admin::app.configuration.tax-categories.save-btn-title') }}
</button>
</div>
</div>

2
packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php
View File

@ -14,7 +14,7 @@
<div class="page-action">
<button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.configuration.tax-categories.edit.edit-button-title') }}
{{ __('admin::app.configuration.tax-categories.save-btn-title') }}
</button>
</div>
</div>

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

@ -14,7 +14,7 @@
<div class="page-action">
<button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.configuration.tax-categories.create') }}
{{ __('admin::app.configuration.tax-rates.save-btn-title') }}
</button>
</div>
</div>

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

@ -14,7 +14,7 @@
<div class="page-action">
<button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.configuration.tax-rates.edit.edit-button-title') }}
{{ __('admin::app.configuration.tax-rates.save-btn-title') }}
</button>
</div>
</div>

7
packages/Webkul/Core/src/Core.php
View File

@ -409,9 +409,7 @@ class Core
// $timezonelist = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL);
/**
* Find all the tax
* rates associated
* with a tax category.
* Find all the tax rates associated with a tax category.
*
* @return Array
*/
@ -421,8 +419,7 @@ class Core
}
/**
* To fetch all
* tax rates.
* To fetch all tax rates.
*
* @return Collection
*/

4
packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
View File

@ -92,7 +92,7 @@
<option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
<option v-for='(state, index) in countryStates[address.billing.country]' value="state.code">
<option v-for='(state, index) in countryStates[address.billing.country]' :value="state.code">
@{{ state.default_name }}
</option>
@ -243,7 +243,7 @@
<option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
<option v-for='(state, index) in countryStates[address.shipping.country]' value="state.code">
<option v-for='(state, index) in countryStates[address.shipping.country]' :value="state.code">
@{{ state.default_name }}
</option>

2
packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php
View File

@ -77,8 +77,6 @@ class TaxCategoryController extends Controller
'description' => 'required|string'
]);
dd($data);
if($currentTaxRule = $this->taxRule->create(request()->input())) {
$allTaxRules = $data['taxrates'];