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

Merge pull request #1722 from jitendra-webkul/jitendra 

Issue #1721 fixed
This commit is contained in:
Jitendra Singh 2019-10-31 19:07:40 +05:30 committed by GitHub
parent 1917817810 c0a4e2fe26
commit 3c1d2d69b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@
<textarea v-validate="'required'" class="control" id="description" name="description" data-vv-as="&quot;{{ __('admin::app.configuration.tax-categories.description') }}&quot;">{{ $taxCategory->description }}</textarea>
</div>
<?php $selectedOptions = old('taxrates') ?: $taxCategory->tax_rates()->pluck('id')->toArray() ?>
<?php $selectedOptions = old('taxrates') ?: $taxCategory->tax_rates()->pluck('tax_rates.id')->toArray() ?>
<div class="control-group" :class="[errors.has('taxrates[]') ? 'has-error' : '']">
<label for="taxrates" class="required">{{ __('admin::app.settings.tax-categories.select-taxrates') }}</label>

2
packages/Webkul/Product/src/Type/Downloadable.php
View File

@ -160,7 +160,7 @@ class Downloadable extends AbstractType
*/
public function prepareForCart($data)
{
if(! isset($data['links']) || ! count($data['links']))
if (! isset($data['links']) || ! count($data['links']))
return trans('shop::app.checkout.cart.integrity.missing_links');
$products = parent::prepareForCart($data);