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

Merge pull request #868 from rahulshukla-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-04-24 14:49:13 +05:30 committed by GitHub
parent 5fd7053782 8b0787ad53
commit 81666cef16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/Webkul/Admin/src/Resources/views/export/export.blade.php
View File

@ -20,7 +20,7 @@
</div>
</div>
<button type="submit" class="btn btn-lg btn-primary" @click="closeModal">
<button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.export.export') }}
</button>
@ -29,11 +29,8 @@
<script>
Vue.component('export-form', {
template: '#export-form-template',
methods: {
closeModal () {
this.$parent.closeModal();
}
}
});
</script>

11
packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php
View File

@ -167,6 +167,7 @@
this.reloadPrice();
this.changeProductImages();
this.changeStock(this.simpleProduct);
},
getSelectedIndex (attribute, value) {
@ -320,6 +321,16 @@
});
}
},
changeStock(productId) {
var inStockElement = document.getElementById('in-stock');
if (productId) {
inStockElement.style.display= "block";
} else {
inStockElement.style.display= "none";
}
},
}
});

12
packages/Webkul/Shop/src/Resources/views/products/view/stock.blade.php
View File

@ -1,7 +1,13 @@
{!! view_render_event('bagisto.shop.products.view.stock.before', ['product' => $product]) !!}
<div class="stock-status {{ $product->type != 'configurable' && ! $product->haveSufficientQuantity(1) ? '' : 'active' }}">
{{ $product->type != 'configurable' && ! $product->haveSufficientQuantity(1) ? __('shop::app.products.out-of-stock') : __('shop::app.products.in-stock') }}
</div>
@if ($product->type == 'simple')
<div class="stock-status {{! $product->haveSufficientQuantity(1) ? '' : 'active' }}">
{{ $product->haveSufficientQuantity(1) ? __('shop::app.products.in-stock') : __('shop::app.products.out-of-stock') }}
</div>
@else
<div class="stock-status in-stock" id="in-stock" style="display: none;">
{{ __('shop::app.products.in-stock') }}
</div>
@endif
{!! view_render_event('bagisto.shop.products.view.stock.after', ['product' => $product]) !!}

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

@ -298,4 +298,4 @@ class TaxRateController extends Controller
return redirect()->route($this->_config['redirect']);
}
}
}